summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/dispatcher.js
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2017-08-04 20:26:35 +0100
committerFilipa Lacerda <filipa@gitlab.com>2017-08-04 20:26:35 +0100
commit92902735a188a1b46dda4b737f67d8a625fca5c7 (patch)
tree0d601b657072924667918f4abc8b5cd3a18e1a0b /app/assets/javascripts/dispatcher.js
parente4f8aa719bcde767793a82103f149cd37b4ad14c (diff)
parent0b10259140a2114bfbd58a2257c32a6317394afe (diff)
downloadgitlab-ce-92902735a188a1b46dda4b737f67d8a625fca5c7.tar.gz
Merge branch 'master' into issue-discussions-refactor
* master: Fix pipeline icon in contextual nav for projects fixed up specs trying to fix tests fix merge conflicts css fixes try and fix some tests 34060 Simply general project settings to use expanded panels
Diffstat (limited to 'app/assets/javascripts/dispatcher.js')
-rw-r--r--app/assets/javascripts/dispatcher.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js b/app/assets/javascripts/dispatcher.js
index e769d495bed..d1aa9a84292 100644
--- a/app/assets/javascripts/dispatcher.js
+++ b/app/assets/javascripts/dispatcher.js
@@ -347,6 +347,8 @@ import GpgBadges from './gpg_badges';
break;
case 'projects:edit':
setupProjectEdit();
+ // Initialize expandable settings panels
+ initSettingsPanels();
break;
case 'projects:imports:show':
new ProjectImport();