diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-26 18:08:29 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-05-26 18:08:29 +0300 |
commit | cac0926ddbef9d1505c2a23ccad60fd47c7d050a (patch) | |
tree | ef6808933314a104d004528f7c84716dc472d93a /app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | |
parent | afd476d5fd62d31c7e0b7509691fa18e632a60df (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue')
-rw-r--r-- | app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue index 8ebb7f6f159..182ec17062a 100644 --- a/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue +++ b/app/assets/javascripts/vue_merge_request_widget/mr_widget_options.vue @@ -15,7 +15,6 @@ import SmartInterval from '~/smart_interval'; import { setFaviconOverlay } from '../lib/utils/favicon'; import Loading from './components/loading.vue'; import MrWidgetAlertMessage from './components/mr_widget_alert_message.vue'; -import WidgetHeader from './components/mr_widget_header.vue'; import MrWidgetPipelineContainer from './components/mr_widget_pipeline_container.vue'; import WidgetRelatedLinks from './components/mr_widget_related_links.vue'; import WidgetSuggestPipeline from './components/mr_widget_suggest_pipeline.vue'; @@ -59,7 +58,6 @@ export default { components: { Loading, ExtensionsContainer, - 'mr-widget-header': WidgetHeader, 'mr-widget-suggest-pipeline': WidgetSuggestPipeline, MrWidgetPipelineContainer, 'mr-widget-related-links': WidgetRelatedLinks, @@ -234,9 +232,6 @@ export default { isRestructuredMrWidgetEnabled() { return window.gon?.features?.restructuredMrWidget; }, - isUpdatedHeaderEnabled() { - return window.gon?.features?.updatedMrHeader; - }, }, watch: { 'mr.machineValue': { @@ -531,14 +526,12 @@ export default { <template> <div v-if="isLoaded" class="mr-state-widget gl-mt-3"> <header - v-if="shouldRenderCollaborationStatus || !isUpdatedHeaderEnabled" - :class="{ 'mr-widget-workflow gl-mt-0!': isUpdatedHeaderEnabled }" - class="gl-rounded-base gl-border-solid gl-border-1 gl-border-gray-100 gl-overflow-hidden" + v-if="shouldRenderCollaborationStatus" + class="gl-rounded-base gl-border-solid gl-border-1 gl-border-gray-100 gl-overflow-hidden mr-widget-workflow gl-mt-0!" > <mr-widget-alert-message v-if="shouldRenderCollaborationStatus" type="info"> {{ s__('mrWidget|Members who can merge are allowed to add commits.') }} </mr-widget-alert-message> - <mr-widget-header v-if="!isUpdatedHeaderEnabled" :mr="mr" /> </header> <mr-widget-suggest-pipeline v-if="shouldSuggestPipelines" |