summaryrefslogtreecommitdiff
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorJacob Schatz <jschatz@gitlab.com>2017-12-07 20:55:10 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-12-07 20:55:10 +0000
commit52ee3e0e06b3666d5f8545ce9e7eba3342088b48 (patch)
treeaf1add5d734e57ac6e653735136098cb5b385f74 /app/assets/javascripts
parent10e8a5ea627cd1092b3c499fb47e80c8653ccd1c (diff)
parentde3eabc5bf530dd95dafa77efc006c163aa6b1f0 (diff)
downloadgitlab-ce-52ee3e0e06b3666d5f8545ce9e7eba3342088b48.tar.gz
Merge branch 'acet-fix-branches-list-on-cherry-pick-modal-after-merge' into 'master'
Fix loading branches list on cherry pick modal after merge. Closes #33894 See merge request gitlab-org/gitlab-ce!15306
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
index 1274db2c4c8..9cb3edead86 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.js
@@ -1,3 +1,4 @@
+import Project from '~/project';
import SmartInterval from '~/smart_interval';
import Flash from '../flash';
import {
@@ -140,6 +141,7 @@ export default {
const el = document.createElement('div');
el.innerHTML = res.body;
document.body.appendChild(el);
+ Project.initRefSwitcher();
}
})
.catch(() => {