Skip to content

Commit 62b1421

Browse files
committed
Merge branch 'fix/trigger-view' of https://github.com/devtron-labs/dashboard into fix/cd-trigger
2 parents d166788 + 150de2e commit 62b1421

File tree

40 files changed

+2005
-1080
lines changed

40 files changed

+2005
-1080
lines changed

.env

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ FEATURE_SWAP_TRAFFIC_ENABLE=false
6060
FEATURE_RB_SYNC_CLUSTER_ENABLE=true
6161
FEATURE_BULK_RESTART_WORKLOADS_FROM_RB=deployment,rollout,daemonset,statefulset
6262
FEATURE_DEFAULT_MERGE_STRATEGY=
63-
FEATURE_CLUSTER_MAP_ENABLE=true
6463
FEATURE_DEFAULT_LANDING_RB_ENABLE=false
6564
FEATURE_ACTION_AUDIOS_ENABLE=true
6665
FEATURE_APPLICATION_TEMPLATES_ENABLE=true

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"private": true,
55
"homepage": "/dashboard",
66
"dependencies": {
7-
"@devtron-labs/devtron-fe-common-lib": "1.18.1-beta-0",
7+
"@devtron-labs/devtron-fe-common-lib": "1.18.0-beta-0",
88
"@esbuild-plugins/node-globals-polyfill": "0.2.3",
99
"@rjsf/core": "^5.13.3",
1010
"@rjsf/utils": "^5.13.3",

src/Pages/Applications/DevtronApps/Details/AppConfigurations/MainContent/DeploymentTemplate/DTChartSelector.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ const ChartSelectorDropdown = ({
120120
/>
121121
</div>
122122
</PopupMenu.Button>
123-
<PopupMenu.Body rootClassName="dc__overflow-auto mxh-350 w-400 dc__border br-4">
123+
<PopupMenu.Body noBackDrop rootClassName="dc__overflow-auto mxh-350 w-400 dc__border br-4">
124124
<>
125125
{customCharts.length > 0 && (
126126
<div

src/Pages/GlobalConfigurations/ClustersAndEnvironments/ClusterComponent.tsx

Lines changed: 0 additions & 271 deletions
This file was deleted.

0 commit comments

Comments
 (0)