diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2018-01-24 16:54:06 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2018-01-24 17:02:00 +0000 |
| commit | 8f6f421643c02cbc4620269f15f51942b389d9cd (patch) | |
| tree | ec7b0d5e288b04b41285ee6b1fd4b7a579be3a4d /app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue | |
| parent | 59a13575a1188e0557e60e2ed9eb33bf254714b5 (diff) | |
| download | gitlab-ce-8f6f421643c02cbc4620269f15f51942b389d9cd.tar.gz | |
Moves status icon into a vue file and adds tests
Moves merging component into a vue file, adds i18n and better test cases
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue index 52dd0245ff0..2968af0d5cb 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue @@ -1,7 +1,7 @@ <script> import simplePoll from '../../../lib/utils/simple_poll'; import eventHub from '../../event_hub'; - import statusIcon from '../mr_widget_status_icon'; + import statusIcon from '../mr_widget_status_icon.vue'; import loadingIcon from '../../../vue_shared/components/loading_icon.vue'; import Flash from '../../../flash'; |