Skip to content

Commit 270edac

Browse files
authored
Merge branch 'master' into GH_8015
2 parents 2454e3c + c80be9b commit 270edac

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

docs/en_US/release_notes_9_2.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@ Housekeeping
3333
Bug fixes
3434
*********
3535

36+
| `Issue #8006 <https://github.com/pgadmin-org/pgadmin4/issues/8006>`_ - Removed the pre-install script from the Red Hat build function as it was causing a No such file or directory warning during the update.
37+
| `Issue #8355 <https://github.com/pgadmin-org/pgadmin4/issues/8355>`_ - Change session files garbage collection strategy.
3638
| `Issue #8437 <https://github.com/pgadmin-org/pgadmin4/issues/8437>`_ - Fixed an issue where the PSQL terminal displays keyname for non alphanumeric keys.
3739
| `Issue #8462 <https://github.com/pgadmin-org/pgadmin4/issues/8462>`_ - Fixed an issue where geometries in the geometry viewer will render partially when the container was resized.
3840
| `Issue #8473 <https://github.com/pgadmin-org/pgadmin4/issues/8473>`_ - Change the stop/terminate icon at all the places for better UX.

pkg/redhat/build.sh

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,12 +68,6 @@ Requires: ${PYTHON_BINARY}, libpq5, krb5-libs
6868
%description
6969
The core server package for pgAdmin. pgAdmin is the most popular and feature rich Open Source administration and development platform for PostgreSQL, the most advanced Open Source database in the world.
7070
71-
%pre
72-
rm -rf /usr/pgadmin4/venv
73-
if [ -d /usr/pgadmin4/web ]; then
74-
cd /usr/pgadmin4/web && rm -rf \$(ls -A -I config_local.py)
75-
fi
76-
7771
%build
7872
7973
%install

web/pgadmin/dashboard/static/js/Dashboard.jsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,8 @@ function getCancelCell(pgAdmin, sid, did, canTakeAction, onSuccess) {
193193

194194
return (
195195
<PgIconButton
196-
size="xs"
196+
size="md"
197+
className='Buttons-dashBoardStopRound'
197198
noBorder
198199
icon={<StopRoundedIcon/>}
199200
onClick={() => {

web/pgadmin/static/js/components/Buttons.jsx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,10 @@ const StyledButton = styled(Button)(({theme, color}) => ({
116116
minWidth: '30px',
117117
}
118118
},
119+
'&.Buttons-dashBoardStopRound':{
120+
paddingLeft : '0px',
121+
paddingBottom : '5px'
122+
}
119123

120124
}));
121125

0 commit comments

Comments
 (0)