diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 12:07:58 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2019-12-09 12:07:58 +0000 |
| commit | 93c6764dacd4c605027ef1cd367d3aebe420b223 (patch) | |
| tree | 5213b1fc874ee3e31701a81007f97d7664b95205 /spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js | |
| parent | aa10b541b6a3fbc7fa712abcc59d073fc8dc620a (diff) | |
| download | gitlab-ce-93c6764dacd4c605027ef1cd367d3aebe420b223.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js')
| -rw-r--r-- | spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js index 57773d1648a..06d236064dd 100644 --- a/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js +++ b/spec/javascripts/vue_mr_widget/components/states/mr_widget_merging_spec.js @@ -1,6 +1,6 @@ import Vue from 'vue'; -import mergingComponent from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue'; import mountComponent from 'spec/helpers/vue_mount_component_helper'; +import mergingComponent from '~/vue_merge_request_widget/components/states/mr_widget_merging.vue'; describe('MRWidgetMerging', () => { let vm; |