diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 12:08:26 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-07 12:08:26 +0300 |
commit | 47da68850624438b5b5b9ff9d648b1e83282c446 (patch) | |
tree | 95f31cd727324ad14cc64e5e5d8b41830cecefe8 /app/assets/javascripts/issues/show | |
parent | ed922e61f47716d82396490b0a19d794c997b9c5 (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issues/show')
-rw-r--r-- | app/assets/javascripts/issues/show/components/header_actions.vue | 6 | ||||
-rw-r--r-- | app/assets/javascripts/issues/show/components/locked_warning.vue | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/app/assets/javascripts/issues/show/components/header_actions.vue b/app/assets/javascripts/issues/show/components/header_actions.vue index ee2468e6c40..d77cb1fa1c2 100644 --- a/app/assets/javascripts/issues/show/components/header_actions.vue +++ b/app/assets/javascripts/issues/show/components/header_actions.vue @@ -12,7 +12,7 @@ import { import { mapActions, mapGetters, mapState } from 'vuex'; import { createAlert, VARIANT_SUCCESS } from '~/flash'; import { EVENT_ISSUABLE_VUE_APP_CHANGE } from '~/issuable/constants'; -import { IssueType, STATUS_CLOSED, TYPE_INCIDENT } from '~/issues/constants'; +import { STATUS_CLOSED, TYPE_INCIDENT, TYPE_ISSUE } from '~/issues/constants'; import { ISSUE_STATE_EVENT_CLOSE, ISSUE_STATE_EVENT_REOPEN } from '~/issues/show/constants'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { visitUrl } from '~/lib/utils/url_utility'; @@ -87,7 +87,7 @@ export default { default: '', }, issueType: { - default: IssueType.Issue, + default: TYPE_ISSUE, }, newIssuePath: { default: '', @@ -118,7 +118,7 @@ export default { }, issueTypeText() { const issueTypeTexts = { - [IssueType.Issue]: s__('HeaderAction|issue'), + [TYPE_ISSUE]: s__('HeaderAction|issue'), [TYPE_INCIDENT]: s__('HeaderAction|incident'), }; diff --git a/app/assets/javascripts/issues/show/components/locked_warning.vue b/app/assets/javascripts/issues/show/components/locked_warning.vue index 4414e693ed0..482aad32daa 100644 --- a/app/assets/javascripts/issues/show/components/locked_warning.vue +++ b/app/assets/javascripts/issues/show/components/locked_warning.vue @@ -1,7 +1,13 @@ <script> import { GlSprintf, GlLink, GlAlert } from '@gitlab/ui'; import { __, sprintf } from '~/locale'; -import { IssuableType } from '~/issues/constants'; +import { + TYPE_ALERT, + TYPE_EPIC, + TYPE_ISSUE, + TYPE_MERGE_REQUEST, + TYPE_TEST_CASE, +} from '~/issues/constants'; export const i18n = Object.freeze({ alertMessage: __( @@ -20,7 +26,9 @@ export default { type: String, required: true, validator(value) { - return Object.values(IssuableType).includes(value); + return [TYPE_ALERT, TYPE_EPIC, TYPE_ISSUE, TYPE_MERGE_REQUEST, TYPE_TEST_CASE].includes( + value, + ); }, }, }, |