diff options
| author | Winnie Hellmann <winnie@gitlab.com> | 2018-10-25 18:20:29 +0300 |
|---|---|---|
| committer | Winnie Hellmann <winnie@gitlab.com> | 2018-10-25 18:54:04 +0300 |
| commit | aaa6cab05a2744b3c1f326b73d62e87b456ed62e (patch) | |
| tree | 29d30bb9fa84df74d5104c8ce8dc900f8367a8e6 /app/assets/javascripts/vue_merge_request_widget/index.js | |
| parent | 10bb8297ebe5fc01540b20c3fd365234779b6837 (diff) | |
Resolve circular dependencies in merge request widget
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/index.js')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/index.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/index.js b/app/assets/javascripts/vue_merge_request_widget/index.js index cc6e620f365..60cebbfc2b2 100644 --- a/app/assets/javascripts/vue_merge_request_widget/index.js +++ b/app/assets/javascripts/vue_merge_request_widget/index.js @@ -1,4 +1,5 @@ -import { Vue, mrWidgetOptions } from './dependencies'; +import Vue from 'vue'; +import MrWidgetOptions from './ee_switch_mr_widget_options'; import Translate from '../vue_shared/translate'; Vue.use(Translate); @@ -6,7 +7,7 @@ Vue.use(Translate); export default () => { gl.mrWidgetData.gitlabLogo = gon.gitlab_logo; - const vm = new Vue(mrWidgetOptions); + const vm = new Vue(MrWidgetOptions); window.gl.mrWidget = { checkStatus: vm.checkStatus, |