summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/pages
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 09:09:48 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2020-03-11 09:09:48 +0000
commit3f3e4bcc50a3280d03299c2c263eafd9c8e3bd7b (patch)
treeeccfc6b87b404f2871cc795bf2f7223a7e391939 /app/assets/javascripts/pages
parent65a1175e466105fca1f40cb5a995fdb100ff334e (diff)
downloadgitlab-ce-3f3e4bcc50a3280d03299c2c263eafd9c8e3bd7b.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/pages')
-rw-r--r--app/assets/javascripts/pages/projects/settings/operations/show/index.js4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/projects/settings/operations/show/index.js b/app/assets/javascripts/pages/projects/settings/operations/show/index.js
index a32c188909c..721d4a31fe4 100644
--- a/app/assets/javascripts/pages/projects/settings/operations/show/index.js
+++ b/app/assets/javascripts/pages/projects/settings/operations/show/index.js
@@ -7,5 +7,7 @@ document.addEventListener('DOMContentLoaded', () => {
mountErrorTrackingForm();
mountOperationSettings();
mountGrafanaIntegration();
- initSettingsPanels();
+ if (!IS_EE) {
+ initSettingsPanels();
+ }
});