diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 21:09:52 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-04-08 21:09:52 +0000 |
| commit | 81c0f29ad962733b0750bdab2d3250e2c796a578 (patch) | |
| tree | 42d31d9c48d156849c87aee7f4c3c494d2ca6260 /app/assets/javascripts/vue_merge_request_widget | |
| parent | 842ac3526cba09feb4b9ccefd0aeeb6edc02035d (diff) | |
| download | gitlab-ce-81c0f29ad962733b0750bdab2d3250e2c796a578.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget')
| -rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue index e0c4679b983..887d1aab524 100644 --- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue +++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue @@ -1,7 +1,7 @@ <script> import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests'; import simplePoll from '~/lib/utils/simple_poll'; -import MergeRequest from '../../../merge_request'; +import MergeRequest from '~/merge_request'; import eventHub from '../../event_hub'; import { MERGE_ACTIVE_STATUS_PHRASES, STATE_MACHINE } from '../../constants'; import statusIcon from '../mr_widget_status_icon.vue'; |