diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 21:09:20 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-17 21:09:20 +0300 |
commit | 6f05d35c3160e3a442b40d6af1e8e584747080b3 (patch) | |
tree | f70f90e1ae24f2366a538972c5520f524663ad86 /app/assets/javascripts/issuable | |
parent | d88ab3545c27cd674f5fb8bff5fb64a9eeed590f (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/issuable')
-rw-r--r-- | app/assets/javascripts/issuable/components/status_box.vue | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/app/assets/javascripts/issuable/components/status_box.vue b/app/assets/javascripts/issuable/components/status_box.vue index cd4f98ba505..498dc859186 100644 --- a/app/assets/javascripts/issuable/components/status_box.vue +++ b/app/assets/javascripts/issuable/components/status_box.vue @@ -1,6 +1,7 @@ <script> import { GlBadge, GlIcon } from '@gitlab/ui'; import Vue from 'vue'; +import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin'; import { fetchPolicies } from '~/lib/graphql'; import { __ } from '~/locale'; import { IssuableType } from '~/issues/constants'; @@ -43,6 +44,7 @@ export default { GlBadge, GlIcon, }, + mixins: [glFeatureFlagMixin()], inject: { query: { default: null }, projectPath: { default: null }, @@ -69,7 +71,13 @@ export default { }, computed: { badgeClass() { - return CLASSES[this.state]; + return [ + CLASSES[this.state], + { + 'gl-vertical-align-bottom': + this.issuableType === IssuableType.MergeRequest && this.glFeatures.updatedMrHeader, + }, + ]; }, badgeVariant() { if (this.state === IssuableStates.Opened) { |