diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-31 00:10:09 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-08-31 00:10:09 +0300 |
| commit | c34d58a898c8e3c6d70609e2e6e4329df40c5aad (patch) | |
| tree | b45294afbe14dd047eb4d20e256774e0d1bcb757 /app/assets/javascripts/vue_merge_request_widget | |
| parent | a283b2d9d06e6b85ed0883e4cf81c5dc3c3ab3e3 (diff) | |
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/stores/mr_widget_store.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js index b1c069d9b1e..a74b7ed8587 100644 --- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js +++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js @@ -1,8 +1,8 @@ import getStateKey from 'ee_else_ce/vue_merge_request_widget/stores/get_state_key'; -import { badgeState } from '~/issuable/components/status_box.vue'; import { STATUS_CLOSED, STATUS_MERGED, STATUS_OPEN } from '~/issues/constants'; import { formatDate, getTimeago, timeagoLanguageCode } from '~/lib/utils/datetime_utility'; import { machine } from '~/lib/utils/finite_state_machine'; +import { badgeState } from '~/merge_requests/components/merge_request_status_badge.vue'; import { MTWPS_MERGE_STRATEGY, MT_MERGE_STRATEGY, |