diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-03 15:13:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-10-03 15:13:29 +0300 |
commit | d9ec4caf8fe4a4315e8e09e48d3ec79fd0a724c5 (patch) | |
tree | 9bff42fdcadcee465c800a3458322fa0fa815135 /app/assets/javascripts/notes | |
parent | 49bd8609775923402610f4c7f7c1f8aa1efdfe7e (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/notes')
-rw-r--r-- | app/assets/javascripts/notes/components/comment_form.vue | 2 | ||||
-rw-r--r-- | app/assets/javascripts/notes/stores/getters.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue index 144cfa4295b..638955d97ed 100644 --- a/app/assets/javascripts/notes/components/comment_form.vue +++ b/app/assets/javascripts/notes/components/comment_form.vue @@ -13,7 +13,7 @@ import { slugifyWithUnderscore, } from '~/lib/utils/text_utility'; import { sprintf } from '~/locale'; -import { badgeState } from '~/merge_requests/components/merge_request_status_badge.vue'; +import { badgeState } from '~/merge_requests/components/merge_request_header.vue'; import MarkdownEditor from '~/vue_shared/components/markdown/markdown_editor.vue'; import TimelineEntryItem from '~/vue_shared/components/notes/timeline_entry_item.vue'; import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; diff --git a/app/assets/javascripts/notes/stores/getters.js b/app/assets/javascripts/notes/stores/getters.js index 096e95a3dcd..62d991c2d9e 100644 --- a/app/assets/javascripts/notes/stores/getters.js +++ b/app/assets/javascripts/notes/stores/getters.js @@ -2,7 +2,7 @@ import { flattenDeep, clone } from 'lodash'; import { match } from '~/diffs/utils/diff_file'; import { isInMRPage } from '~/lib/utils/common_utils'; import { doesHashExistInUrl } from '~/lib/utils/url_utility'; -import { badgeState } from '~/merge_requests/components/merge_request_status_badge.vue'; +import { badgeState } from '~/merge_requests/components/merge_request_header.vue'; import * as constants from '../constants'; import { collapseSystemNotes } from './collapse_utils'; |