Add latest changes from gitlab-org/gitlab@master

23 files changed, 156 insertions, 529 deletions

diff --git a/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue b/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
index 437d035fbf5..266f1fb594b 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/added_commit_message.vue
@@ -52,31 +52,20 @@ export default {
       return n__('%d commit', '%d commits', this.isSquashEnabled ? 1 : this.commitsCount);
     },
     message() {
-      if (this.glFeatures.restructuredMrWidget) {
-        if (this.state === 'closed') {
-          return s__('mrWidgetCommitsAdded|The changes were not merged into %{targetBranch}.');
-        } else if (this.isMerged) {
-          return s__(
-            'mrWidgetCommitsAdded|Changes merged into %{targetBranch} with %{mergeCommitSha}%{squashedCommits}.',
-          );
-        }
-
-        return this.isFastForwardEnabled
-          ? s__('mrWidgetCommitsAdded|%{commitCount} will be added to %{targetBranch}.')
-          : s__(
-              'mrWidgetCommitsAdded|%{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}%{squashedCommits}.',
-            );
+      if (this.state === 'closed') {
+        return s__('mrWidgetCommitsAdded|The changes were not merged into %{targetBranch}.');
+      } else if (this.isMerged) {
+        return s__(
+          'mrWidgetCommitsAdded|Changes merged into %{targetBranch} with %{mergeCommitSha}%{squashedCommits}.',
+        );
       }
 
       return this.isFastForwardEnabled
-        ? s__('mrWidgetCommitsAdded|Adds %{commitCount} to %{targetBranch}.')
+        ? s__('mrWidgetCommitsAdded|%{commitCount} will be added to %{targetBranch}.')
         : s__(
-            'mrWidgetCommitsAdded|Adds %{commitCount} and %{mergeCommitCount} to %{targetBranch}%{squashedCommits}.',
+            'mrWidgetCommitsAdded|%{commitCount} and %{mergeCommitCount} will be added to %{targetBranch}%{squashedCommits}.',
           );
     },
-    textDecorativeComponent() {
-      return this.glFeatures.restructuredMrWidget ? 'span' : 'strong';
-    },
     squashCommitMessage() {
       if (this.isMerged) {
         return s__('mergedCommitsAdded|(commits were squashed)');
@@ -93,25 +82,19 @@ export default {
   <span>
     <gl-sprintf :message="message">
       <template #commitCount>
-        <component :is="textDecorativeComponent" class="commits-count-message">{{
-          commitsCountMessage
-        }}</component>
+        <span class="commits-count-message">{{ commitsCountMessage }}</span>
       </template>
       <template #mergeCommitCount>
-        <component :is="textDecorativeComponent">{{ $options.mergeCommitCount }}</component>
+        <span>{{ $options.mergeCommitCount }}</span>
       </template>
       <template #targetBranch>
         <span class="label-branch">{{ targetBranchEscaped }}</span>
       </template>
       <template #squashedCommits>
-        <template v-if="glFeatures.restructuredMrWidget && isSquashEnabled">
-          {{ squashCommitMessage }}</template
-        ></template
-      >
+        <template v-if="isSquashEnabled"> {{ squashCommitMessage }}</template>
+      </template>
       <template #mergeCommitSha>
-        <template v-if="glFeatures.restructuredMrWidget"
-          ><span class="label-branch">{{ mergeCommitSha }}</span></template
-        >
+        <span class="label-branch">{{ mergeCommitSha }}</span>
       </template>
     </gl-sprintf>
   </span>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
index 913aa0e1e34..94a1b805b99 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_related_links.vue
@@ -1,7 +1,6 @@
 <script>
-import { GlSafeHtmlDirective as SafeHtml, GlLink, GlSprintf } from '@gitlab/ui';
+import { GlSafeHtmlDirective as SafeHtml, GlLink } from '@gitlab/ui';
 import { s__, n__ } from '~/locale';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
 export default {
   name: 'MRWidgetRelatedLinks',
@@ -10,9 +9,7 @@ export default {
   },
   components: {
     GlLink,
-    GlSprintf,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     relatedLinks: {
       type: Object,
@@ -67,42 +64,21 @@ export default {
 </script>
 <template>
   <section>
-    <p
-      v-if="relatedLinks.closing"
-      :class="{ 'gl-display-inline gl-m-0': glFeatures.restructuredMrWidget }"
-    >
+    <p v-if="relatedLinks.closing" class="gl-display-inline gl-m-0">
       {{ closesText }}
       <span v-safe-html="relatedLinks.closing"></span>
     </p>
-    <p
-      v-if="relatedLinks.mentioned"
-      :class="{ 'gl-display-inline gl-m-0': glFeatures.restructuredMrWidget }"
-    >
-      <span v-if="relatedLinks.closing && glFeatures.restructuredMrWidget">&middot;</span>
+    <p v-if="relatedLinks.mentioned" class="gl-display-inline gl-m-0">
+      <span v-if="relatedLinks.closing">&middot;</span>
       {{ n__('mrWidget|Mentions issue', 'mrWidget|Mentions issues', relatedLinks.mentionedCount) }}
       <span v-safe-html="relatedLinks.mentioned"></span>
     </p>
-    <p
-      v-if="shouldShowAssignToMeLink"
-      :class="{ 'gl-display-inline gl-m-0': glFeatures.restructuredMrWidget }"
-    >
+    <p v-if="shouldShowAssignToMeLink" class="gl-display-inline gl-m-0">
       <span>
         <gl-link rel="nofollow" data-method="post" :href="relatedLinks.assignToMe">{{
           assignIssueText
         }}</gl-link>
       </span>
     </p>
-    <div
-      v-if="divergedCommitsCount > 0 && !glFeatures.restructuredMrWidget"
-      class="diverged-commits-count"
-    >
-      <gl-sprintf :message="s__('mrWidget|The source branch is %{link} the target branch')">
-        <template #link>
-          <gl-link :href="targetBranchPath">{{
-            n__('%d commit behind', '%d commits behind', divergedCommitsCount)
-          }}</gl-link>
-        </template>
-      </gl-sprintf>
-    </div>
   </section>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
index 7ff1eb6e73a..5b8acb4ebf8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_status_icon.vue
@@ -1,25 +1,17 @@
 <script>
-import { GlButton, GlLoadingIcon } from '@gitlab/ui';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import { GlLoadingIcon } from '@gitlab/ui';
 import ciIcon from '~/vue_shared/components/ci_icon.vue';
 
 export default {
   components: {
     ciIcon,
-    GlButton,
     GlLoadingIcon,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     status: {
       type: String,
       required: true,
     },
-    showDisabledButton: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
   },
   computed: {
     isLoading() {
@@ -42,15 +34,5 @@ export default {
       </div>
       <ci-icon v-else :status="statusObj" :size="24" />
     </div>
-
-    <gl-button
-      v-if="!glFeatures.restructuredMrWidget && showDisabledButton"
-      category="primary"
-      variant="confirm"
-      data-testid="disabled-merge-button"
-      :disabled="true"
-    >
-      {{ s__('mrWidget|Merge') }}
-    </gl-button>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue
index 18761d04c2e..515a7cf51a1 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/commit_edit.vue
@@ -1,8 +1,5 @@
 <script>
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
-
 export default {
-  mixins: [glFeatureFlagMixin()],
   props: {
     value: {
       type: String,
@@ -23,10 +20,7 @@ export default {
 <template>
   <li>
     <div class="commit-message-editor">
-      <div
-        :class="{ 'gl-mb-3': glFeatures.restructuredMrWidget }"
-        class="d-flex flex-wrap align-items-center justify-content-between"
-      >
+      <div class="d-flex flex-wrap align-items-center justify-content-between gl-mb-3">
         <label class="col-form-label" :for="inputId">
           <strong>{{ label }}</strong>
         </label>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue
index 071920856a8..f74826f95d3 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_archived.vue
@@ -1,5 +1,4 @@
 <script>
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import statusIcon from '../mr_widget_status_icon.vue';
 
 export default {
@@ -7,7 +6,6 @@ export default {
   components: {
     statusIcon,
   },
-  mixins: [glFeatureFlagMixin()],
 };
 </script>
 <template>
@@ -16,7 +14,7 @@ export default {
       <status-icon status="warning" show-disabled-button />
     </div>
     <div class="media-body">
-      <span :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }" class="bold">
+      <span class="gl-ml-0! gl-text-body! bold">
         {{ s__('mrWidget|Merge unavailable: merge requests are read-only on archived projects.') }}
       </span>
     </div>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
index aabbeac564a..63bd8f3d8dc 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_auto_merge_enabled.vue
@@ -3,7 +3,6 @@ import { GlSkeletonLoader, GlIcon, GlButton, GlSprintf } from '@gitlab/ui';
 import autoMergeMixin from 'ee_else_ce/vue_merge_request_widget/mixins/auto_merge';
 import autoMergeEnabledQuery from 'ee_else_ce/vue_merge_request_widget/queries/states/auto_merge_enabled.query.graphql';
 import createFlash from '~/flash';
-import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { __ } from '~/locale';
 import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { AUTO_MERGE_STRATEGIES } from '../../constants';
@@ -78,19 +77,6 @@ export default {
     autoMergeStrategy() {
       return (this.glFeatures.mergeRequestWidgetGraphql ? this.state : this.mr).autoMergeStrategy;
     },
-    canRemoveSourceBranch() {
-      const { currentUserId } = this.mr;
-      const mergeUserId = this.glFeatures.mergeRequestWidgetGraphql
-        ? getIdFromGraphQLId(this.state.mergeUser?.id)
-        : this.mr.mergeUserId;
-      const canRemoveSourceBranch = this.glFeatures.mergeRequestWidgetGraphql
-        ? this.state.userPermissions.removeSourceBranch
-        : this.mr.canRemoveSourceBranch;
-
-      return (
-        !this.shouldRemoveSourceBranch && canRemoveSourceBranch && mergeUserId === currentUserId
-      );
-    },
   },
   methods: {
     cancelAutomaticMerge() {
@@ -175,24 +161,6 @@ export default {
             {{ cancelButtonText }}
           </gl-button>
         </h4>
-        <section v-if="!glFeatures.restructuredMrWidget" class="mr-info-list">
-          <p v-if="shouldRemoveSourceBranch">
-            {{ s__('mrWidget|Deletes the source branch') }}
-          </p>
-          <p v-else class="gl-display-flex">
-            <span class="gl-mr-3">{{ s__('mrWidget|Does not delete the source branch') }}</span>
-            <gl-button
-              v-if="canRemoveSourceBranch"
-              :loading="isRemovingSourceBranch"
-              size="small"
-              class="js-remove-source-branch"
-              data-testid="removeSourceBranchButton"
-              @click="removeSourceBranch"
-            >
-              {{ s__('mrWidget|Delete source branch') }}
-            </gl-button>
-          </p>
-        </section>
       </div>
     </template>
   </div>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
index fd42fa0421f..e2d87d8d536 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_checking.vue
@@ -1,5 +1,4 @@
 <script>
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import statusIcon from '../mr_widget_status_icon.vue';
 
 export default {
@@ -7,14 +6,13 @@ export default {
   components: {
     statusIcon,
   },
-  mixins: [glFeatureFlagMixin()],
 };
 </script>
 <template>
   <div class="mr-widget-body media">
     <status-icon :show-disabled-button="true" status="loading" />
     <div class="media-body space-children">
-      <span :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }" class="bold">
+      <span class="gl-ml-0! gl-text-body! bold">
         {{ s__('mrWidget|Checking if merge request can be merged…') }}
       </span>
     </div>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
index d50e52f5ac1..61f7d26f51e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_closed.vue
@@ -1,5 +1,4 @@
 <script>
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import MrWidgetAuthorTime from '../mr_widget_author_time.vue';
 import statusIcon from '../mr_widget_status_icon.vue';
 
@@ -9,7 +8,6 @@ export default {
     MrWidgetAuthorTime,
     statusIcon,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     /* TODO: This is providing all store and service down when it
       only needs metrics and targetBranch */
@@ -30,13 +28,6 @@ export default {
         :date-title="mr.metrics.closedAt"
         :date-readable="mr.metrics.readableClosedAt"
       />
-
-      <section v-if="!glFeatures.restructuredMrWidget" class="mr-info-list">
-        <p>
-          {{ s__('mrWidget|The changes were not merged into') }}
-          <a :href="mr.targetBranchPath" class="label-branch"> {{ mr.targetBranch }} </a>
-        </p>
-      </section>
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
index def30dacf8a..7652d7049f2 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_conflicts.vue
@@ -97,18 +97,14 @@ export default {
       </gl-skeleton-loader>
     </div>
     <div v-else class="media-body space-children gl-display-flex gl-align-items-center">
-      <span
-        v-if="shouldBeRebased"
-        :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }"
-        class="bold"
-      >
+      <span v-if="shouldBeRebased" class="gl-ml-0! gl-text-body! bold">
         {{
           s__(`mrWidget|Merge blocked: fast-forward merge is not possible.
   To merge this request, first rebase locally.`)
         }}
       </span>
       <template v-else>
-        <span :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }" class="bold">
+        <span class="gl-ml-0! gl-text-body! bold">
           {{ s__('mrWidget|Merge blocked: merge conflicts must be resolved.') }}
           <span v-if="!canMerge">
             {{
@@ -121,14 +117,14 @@ export default {
         <gl-button
           v-if="showResolveButton"
           :href="mr.conflictResolutionPath"
-          :size="glFeatures.restructuredMrWidget ? 'small' : 'medium'"
+          size="small"
           data-testid="resolve-conflicts-button"
         >
           {{ s__('mrWidget|Resolve conflicts') }}
         </gl-button>
         <gl-button
           v-if="canMerge"
-          :size="glFeatures.restructuredMrWidget ? 'small' : 'medium'"
+          size="small"
           data-testid="merge-locally-button"
           class="js-check-out-modal-trigger"
         >
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
index bf036f562ed..19df346759f 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merged.vue
@@ -1,13 +1,10 @@
 <script>
-/* eslint-disable @gitlab/vue-require-i18n-strings */
-import { GlLoadingIcon, GlButton, GlTooltipDirective, GlIcon } from '@gitlab/ui';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
+import { GlButton, GlTooltipDirective, GlIcon } from '@gitlab/ui';
 import api from '~/api';
 import createFlash from '~/flash';
 import { s__, __ } from '~/locale';
 import { OPEN_REVERT_MODAL, OPEN_CHERRY_PICK_MODAL } from '~/projects/commit/constants';
 import modalEventHub from '~/projects/commit/event_hub';
-import ClipboardButton from '~/vue_shared/components/clipboard_button.vue';
 import eventHub from '../../event_hub';
 import MrWidgetAuthorTime from '../mr_widget_author_time.vue';
 
@@ -19,11 +16,8 @@ export default {
   components: {
     MrWidgetAuthorTime,
     GlIcon,
-    ClipboardButton,
-    GlLoadingIcon,
     GlButton,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     mr: {
       type: Object,
@@ -183,41 +177,6 @@ export default {
           {{ s__('mrWidget|Delete source branch') }}
         </gl-button>
       </div>
-      <section
-        v-if="!glFeatures.restructuredMrWidget"
-        class="mr-info-list"
-        data-qa-selector="merged_status_content"
-      >
-        <p>
-          {{ s__('mrWidget|The changes were merged into') }}
-          <span class="label-branch">
-            <a :href="mr.targetBranchPath">{{ mr.targetBranch }}</a>
-          </span>
-          <template v-if="mr.mergeCommitSha">
-            with
-            <a
-              :href="mr.mergeCommitPath"
-              class="commit-sha js-mr-merged-commit-sha"
-              v-text="mr.shortMergeCommitSha"
-            >
-            </a>
-            <clipboard-button
-              :title="__('Copy commit SHA')"
-              :text="mr.mergeCommitSha"
-              css-class="js-mr-merged-copy-sha"
-              category="tertiary"
-              size="small"
-            />
-          </template>
-        </p>
-        <p v-if="mr.sourceBranchRemoved">
-          {{ s__('mrWidget|The source branch has been deleted') }}
-        </p>
-        <p v-if="shouldShowSourceBranchRemoving">
-          <gl-loading-icon size="sm" :inline="true" />
-          <span> {{ s__('mrWidget|The source branch is being deleted') }} </span>
-        </p>
-      </section>
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue
index b86ab69af3f..c7574a41bb8 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_merging.vue
@@ -1,6 +1,5 @@
 <script>
 import { refreshUserMergeRequestCounts } from '~/commons/nav/user_merge_requests';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import simplePoll from '~/lib/utils/simple_poll';
 import MergeRequest from '~/merge_request';
 import eventHub from '../../event_hub';
@@ -15,7 +14,6 @@ export default {
   components: {
     statusIcon,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     mr: {
       type: Object,
@@ -90,14 +88,6 @@ export default {
         {{ mergeStatus.message }}
         <gl-emoji :data-name="mergeStatus.emoji" />
       </h4>
-      <section v-if="!glFeatures.restructuredMrWidget" class="mr-info-list">
-        <p>
-          {{ s__('mrWidget|Merges changes into') }}
-          <span class="label-branch">
-            <a :href="mr.targetBranchPath">{{ mr.targetBranch }}</a>
-          </span>
-        </p>
-      </section>
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
index cadbd9c28a9..659d12d1160 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_missing_branch.vue
@@ -74,13 +74,7 @@ export default {
     <status-icon :show-disabled-button="true" status="warning" />
 
     <div class="media-body space-children">
-      <span
-        :class="{
-          'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget,
-        }"
-        class="bold js-branch-text"
-        data-testid="widget-content"
-      >
+      <span class="gl-ml-0! gl-text-body! bold js-branch-text" data-testid="widget-content">
         <gl-sprintf :message="warning">
           <template #code="{ content }">
             <code>{{ content }}</code>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
index 34c5a2ff2c8..e99ee59b877 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_pipeline_blocked.vue
@@ -14,7 +14,7 @@ export default {
   <div class="mr-widget-body media">
     <status-icon :show-disabled-button="true" status="warning" />
     <div class="media-body space-children">
-      <span :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }" class="bold">
+      <span class="gl-ml-0! gl-text-body! bold">
         {{
           s__(
             `mrWidget|Merge blocked: pipeline must succeed. It's waiting for a manual action to continue.`,
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
index 59767eb2e6e..0880fd81500 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/mr_widget_rebase.vue
@@ -161,15 +161,13 @@ export default {
       <div class="rebase-state-find-class-convention media media-body space-children">
         <span
           v-if="rebaseInProgress || isMakingRequest"
-          :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }"
-          class="gl-font-weight-bold"
+          class="gl-ml-0! gl-text-body! gl-font-weight-bold"
           data-testid="rebase-message"
           >{{ __('Rebase in progress') }}</span
         >
         <span
           v-if="!rebaseInProgress && !canPushToSourceBranch"
-          :class="{ 'gl-text-body!': glFeatures.restructuredMrWidget }"
-          class="gl-font-weight-bold gl-ml-0!"
+          class="gl-text-body! gl-font-weight-bold gl-ml-0!"
           data-testid="rebase-message"
           >{{ fastForwardMergeText }}</span
         >
@@ -177,30 +175,9 @@ export default {
           v-if="!rebaseInProgress && canPushToSourceBranch && !isMakingRequest"
           class="accept-merge-holder clearfix js-toggle-container accept-action media space-children gl-align-items-center"
         >
-          <gl-button
-            v-if="!glFeatures.restructuredMrWidget"
-            :loading="isMakingRequest"
-            variant="confirm"
-            data-qa-selector="mr_rebase_button"
-            data-testid="standard-rebase-button"
-            @click="rebase"
-          >
-            {{ __('Rebase') }}
-          </gl-button>
-          <gl-button
-            v-if="!glFeatures.restructuredMrWidget && showRebaseWithoutCi"
-            :loading="isMakingRequest"
-            variant="confirm"
-            category="secondary"
-            data-testid="rebase-without-ci-button"
-            @click="rebaseWithoutCi"
-          >
-            {{ __('Rebase without pipeline') }}
-          </gl-button>
           <span
             v-if="!rebasingError"
-            :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }"
-            class="gl-font-weight-bold"
+            class="gl-ml-0! gl-text-body! gl-font-weight-bold"
             data-testid="rebase-message"
             data-qa-selector="no_fast_forward_message_content"
             >{{
@@ -211,18 +188,18 @@ export default {
             rebasingError
           }}</span>
           <gl-button
-            v-if="glFeatures.restructuredMrWidget"
             :loading="isMakingRequest"
             variant="confirm"
             size="small"
             data-qa-selector="mr_rebase_button"
+            data-testid="standard-rebase-button"
             class="gl-ml-3!"
             @click="rebase"
           >
             {{ __('Rebase') }}
           </gl-button>
           <gl-button
-            v-if="glFeatures.restructuredMrWidget && showRebaseWithoutCi"
+            v-if="showRebaseWithoutCi"
             :loading="isMakingRequest"
             variant="confirm"
             size="small"
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue
index d204befef58..d507e5f232b 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/pipeline_failed.vue
@@ -1,7 +1,6 @@
 <script>
 import { GlLink, GlSprintf } from '@gitlab/ui';
 import { helpPagePath } from '~/helpers/help_page_helper';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { s__ } from '~/locale';
 import statusIcon from '../mr_widget_status_icon.vue';
 
@@ -12,7 +11,6 @@ export default {
     GlSprintf,
     statusIcon,
   },
-  mixins: [glFeatureFlagMixin()],
   computed: {
     troubleshootingDocsPath() {
       return helpPagePath('ci/troubleshooting', { anchor: 'merge-request-status-messages' });
@@ -30,7 +28,7 @@ export default {
   <div class="mr-widget-body media">
     <status-icon :show-disabled-button="true" status="warning" />
     <div class="media-body space-children">
-      <span :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }" class="bold">
+      <span class="gl-ml-0! gl-text-body! bold">
         <gl-sprintf :message="$options.i18n.failedMessage">
           <template #link="{ content }">
             <gl-link :href="troubleshootingDocsPath" target="_blank">
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
index cf482410bef..884fc666276 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/ready_to_merge.vue
@@ -31,12 +31,10 @@ import {
 import eventHub from '../../event_hub';
 import mergeRequestQueryVariablesMixin from '../../mixins/merge_request_query_variables';
 import MergeRequestStore from '../../stores/mr_widget_store';
-import statusIcon from '../mr_widget_status_icon.vue';
 import AddedCommitMessage from '../added_commit_message.vue';
 import RelatedLinks from '../mr_widget_related_links.vue';
 import CommitEdit from './commit_edit.vue';
 import CommitMessageDropdown from './commit_message_dropdown.vue';
-import CommitsHeader from './commits_header.vue';
 import SquashBeforeMerge from './squash_before_merge.vue';
 import MergeFailedPipelineConfirmationDialog from './merge_failed_pipeline_confirmation_dialog.vue';
 
@@ -96,9 +94,7 @@ export default {
     },
   },
   components: {
-    statusIcon,
     SquashBeforeMerge,
-    CommitsHeader,
     CommitEdit,
     CommitMessageDropdown,
     GlIcon,
@@ -320,34 +316,24 @@ export default {
     showDangerMessageForMergeTrain() {
       return this.preferredAutoMergeStrategy === MT_MERGE_STRATEGY && this.isPipelineFailed;
     },
-    restructuredWidgetShowMergeButtons() {
-      if (this.glFeatures.restructuredMrWidget) {
-        return (
-          (this.isMergeAllowed || this.isAutoMergeAvailable) &&
-          this.state.userPermissions.canMerge &&
-          !this.mr.mergeOngoing &&
-          !this.mr.autoMergeEnabled
-        );
-      }
-
-      return true;
+    shouldShowMergeControls() {
+      return (
+        (this.isMergeAllowed || this.isAutoMergeAvailable) &&
+        (this.stateData.userPermissions?.canMerge || this.mr.canMerge) &&
+        !this.mr.mergeOngoing &&
+        !this.mr.autoMergeEnabled
+      );
     },
     sourceBranchDeletedText() {
-      if (this.glFeatures.restructuredMrWidget) {
-        if (this.removeSourceBranch) {
-          return this.mr.state === 'merged'
-            ? __('Deleted the source branch.')
-            : __('Source branch will be deleted.');
-        }
-
+      if (this.removeSourceBranch) {
         return this.mr.state === 'merged'
-          ? __('Did not delete the source branch.')
-          : __('Source branch will not be deleted.');
+          ? __('Deleted the source branch.')
+          : __('Source branch will be deleted.');
       }
 
-      return this.removeSourceBranch
-        ? __('Deletes the source branch.')
-        : __('Does not delete the source branch.');
+      return this.mr.state === 'merged'
+        ? __('Did not delete the source branch.')
+        : __('Source branch will not be deleted.');
     },
   },
   mounted() {
@@ -525,10 +511,7 @@ export default {
 <template>
   <div
     data-testid="ready_to_merge_state"
-    :class="{
-      'gl-border-t-1 gl-border-t-solid gl-border-gray-100 gl-bg-gray-10 gl-pl-7 gl-rounded-bottom-left-base gl-rounded-bottom-right-base':
-        glFeatures.restructuredMrWidget,
-    }"
+    class="gl-border-t-1 gl-border-t-solid gl-border-gray-100 gl-bg-gray-10 gl-pl-7 gl-rounded-bottom-left-base gl-rounded-bottom-right-base"
   >
     <div v-if="loading" class="mr-widget-body">
       <div class="gl-w-full mr-ready-to-merge-loader">
@@ -541,16 +524,10 @@ export default {
       </div>
     </div>
     <template v-else>
-      <div
-        class="mr-widget-body media"
-        :class="{
-          'mr-widget-body-line-height-1': glFeatures.restructuredMrWidget,
-        }"
-      >
-        <status-icon v-if="!glFeatures.restructuredMrWidget" :status="iconClass" />
+      <div class="mr-widget-body media mr-widget-body-line-height-1">
         <div class="media-body">
           <div class="mr-widget-body-controls gl-display-flex gl-align-items-center gl-flex-wrap">
-            <gl-button-group v-if="restructuredWidgetShowMergeButtons" class="gl-align-self-start">
+            <gl-button-group v-if="shouldShowMergeControls" class="gl-align-self-start">
               <gl-button
                 size="medium"
                 category="primary"
@@ -603,19 +580,14 @@ export default {
             <merge-train-helper-icon v-if="shouldRenderMergeTrainHelperIcon" class="gl-mx-3" />
             <div
               v-if="shouldShowMergeControls"
-              :class="{ 'gl-w-full gl-order-n1 gl-mb-5': glFeatures.restructuredMrWidget }"
-              class="gl-display-flex gl-align-items-center gl-flex-wrap"
+              class="gl-display-flex gl-align-items-center gl-flex-wrap gl-w-full gl-order-n1 gl-mb-5"
             >
               <gl-form-checkbox
                 v-if="canRemoveSourceBranch"
                 id="remove-source-branch-input"
                 v-model="removeSourceBranch"
                 :disabled="isRemoveSourceBranchButtonDisabled"
-                :class="{
-                  'gl-mx-3': !glFeatures.restructuredMrWidget,
-                  'gl-mr-5': glFeatures.restructuredMrWidget,
-                }"
-                class="js-remove-source-branch-checkbox gl-display-flex gl-align-items-center"
+                class="js-remove-source-branch-checkbox gl-display-flex gl-align-items-center gl-mr-5"
               >
                 {{ __('Delete source branch') }}
               </gl-form-checkbox>
@@ -626,16 +598,11 @@ export default {
                 v-model="squashBeforeMerge"
                 :help-path="mr.squashBeforeMergeHelpPath"
                 :is-disabled="isSquashReadOnly"
-                :class="{
-                  'gl-mx-3': !glFeatures.restructuredMrWidget,
-                  'gl-mr-5': glFeatures.restructuredMrWidget,
-                }"
+                class="gl-mr-5"
               />
 
               <gl-form-checkbox
-                v-if="
-                  glFeatures.restructuredMrWidget && (shouldShowSquashEdit || shouldShowMergeEdit)
-                "
+                v-if="shouldShowSquashEdit || shouldShowMergeEdit"
                 v-model="editCommitMessage"
                 data-testid="widget_edit_commit_message"
                 class="gl-display-flex gl-align-items-center"
@@ -644,198 +611,113 @@ export default {
               </gl-form-checkbox>
             </div>
             <div
-              v-else-if="!glFeatures.restructuredMrWidget"
-              class="bold js-resolve-mr-widget-items-message gl-ml-3"
+              v-if="editCommitMessage"
+              class="gl-w-full gl-order-n1"
+              data-testid="edit_commit_message"
             >
-              <div
-                v-if="hasPipelineMustSucceedConflict"
-                class="gl-display-flex gl-align-items-center"
-                data-testid="pipeline-succeed-conflict"
-              >
-                <gl-sprintf :message="pipelineMustSucceedConflictText" />
-                <gl-link
-                  :href="mr.pipelineMustSucceedDocsPath"
-                  target="_blank"
-                  class="gl-display-flex gl-ml-2"
+              <ul class="border-top commits-list flex-list gl-list-style-none gl-p-0 gl-pt-4">
+                <commit-edit
+                  v-if="shouldShowSquashEdit"
+                  :value="squashCommitMessage"
+                  :label="__('Squash commit message')"
+                  input-id="squash-message-edit"
+                  class="gl-m-0! gl-p-0!"
+                  @input="setSquashCommitMessage"
                 >
-                  <gl-icon name="question" />
-                </gl-link>
-              </div>
-              <gl-sprintf v-else :message="mergeDisabledText" />
+                  <template #header>
+                    <commit-message-dropdown :commits="commits" @input="setSquashCommitMessage" />
+                  </template>
+                </commit-edit>
+                <commit-edit
+                  v-if="shouldShowMergeEdit"
+                  :value="commitMessage"
+                  :label="__('Merge commit message')"
+                  input-id="merge-message-edit"
+                  class="gl-m-0! gl-p-0!"
+                  @input="setCommitMessage"
+                />
+                <li class="gl-m-0! gl-p-0!">
+                  <p class="form-text text-muted">
+                    <gl-sprintf :message="commitTemplateHintText">
+                      <template #link="{ content }">
+                        <gl-link :href="commitTemplateHelpPage" class="inline-link" target="_blank">
+                          {{ content }}
+                        </gl-link>
+                      </template>
+                    </gl-sprintf>
+                  </p>
+                </li>
+              </ul>
             </div>
-            <template v-if="glFeatures.restructuredMrWidget">
-              <div
-                v-if="editCommitMessage"
-                class="gl-w-full gl-order-n1"
-                data-testid="edit_commit_message"
-              >
-                <ul
-                  :class="{
-                    'content-list': !glFeatures.restructuredMrWidget,
-                    'gl-list-style-none gl-p-0 gl-pt-4': glFeatures.restructuredMrWidget,
-                  }"
-                  class="border-top commits-list flex-list"
-                >
-                  <commit-edit
-                    v-if="shouldShowSquashEdit"
-                    :value="squashCommitMessage"
-                    :label="__('Squash commit message')"
-                    input-id="squash-message-edit"
-                    class="gl-m-0! gl-p-0!"
-                    @input="setSquashCommitMessage"
+            <div
+              v-if="!shouldShowMergeControls"
+              class="gl-w-full gl-order-n1 gl-text-gray-500"
+              data-qa-selector="merged_status_content"
+            >
+              <strong v-if="mr.state !== 'closed'">
+                {{ __('Merge details') }}
+              </strong>
+              <ul class="gl-pl-4 gl-m-0">
+                <li v-if="mr.divergedCommitsCount > 0" class="gl-line-height-normal">
+                  <gl-sprintf
+                    :message="s__('mrWidget|The source branch is %{link} the target branch')"
                   >
-                    <template #header>
-                      <commit-message-dropdown :commits="commits" @input="setSquashCommitMessage" />
+                    <template #link>
+                      <gl-link :href="mr.targetBranchPath">{{
+                        n__('%d commit behind', '%d commits behind', mr.divergedCommitsCount)
+                      }}</gl-link>
                     </template>
-                  </commit-edit>
-                  <commit-edit
-                    v-if="shouldShowMergeEdit"
-                    :value="commitMessage"
-                    :label="__('Merge commit message')"
-                    input-id="merge-message-edit"
-                    class="gl-m-0! gl-p-0!"
-                    @input="setCommitMessage"
+                  </gl-sprintf>
+                </li>
+                <li class="gl-line-height-normal">
+                  <added-commit-message
+                    :state="mr.state"
+                    :merge-commit-sha="mr.shortMergeCommitSha"
+                    :is-squash-enabled="squashBeforeMerge"
+                    :is-fast-forward-enabled="!shouldShowMergeEdit"
+                    :commits-count="commitsCount"
+                    :target-branch="stateData.targetBranch"
                   />
-                  <li class="gl-m-0! gl-p-0!">
-                    <p class="form-text text-muted">
-                      <gl-sprintf :message="commitTemplateHintText">
-                        <template #link="{ content }">
-                          <gl-link
-                            :href="commitTemplateHelpPage"
-                            class="inline-link"
-                            target="_blank"
-                          >
-                            {{ content }}
-                          </gl-link>
-                        </template>
-                      </gl-sprintf>
-                    </p>
-                  </li>
-                </ul>
-              </div>
-              <div
-                v-if="!restructuredWidgetShowMergeButtons"
-                class="gl-w-full gl-order-n1 gl-text-gray-500"
-                data-qa-selector="merged_status_content"
-              >
-                <strong v-if="mr.state !== 'closed'">
-                  {{ __('Merge details') }}
-                </strong>
-                <ul class="gl-pl-4 gl-m-0">
-                  <li v-if="mr.divergedCommitsCount > 0" class="gl-line-height-normal">
-                    <gl-sprintf
-                      :message="s__('mrWidget|The source branch is %{link} the target branch')"
-                    >
-                      <template #link>
-                        <gl-link :href="mr.targetBranchPath">{{
-                          n__('%d commit behind', '%d commits behind', mr.divergedCommitsCount)
-                        }}</gl-link>
-                      </template>
-                    </gl-sprintf>
-                  </li>
-                  <li class="gl-line-height-normal">
-                    <added-commit-message
-                      :state="mr.state"
-                      :merge-commit-sha="mr.shortMergeCommitSha"
-                      :is-squash-enabled="squashBeforeMerge"
-                      :is-fast-forward-enabled="!shouldShowMergeEdit"
-                      :commits-count="commitsCount"
-                      :target-branch="stateData.targetBranch"
-                    />
-                  </li>
-                  <li v-if="mr.state !== 'closed'" class="gl-line-height-normal">
-                    {{ sourceBranchDeletedText }}
-                  </li>
-                  <li v-if="mr.relatedLinks" class="gl-line-height-normal">
-                    <related-links
-                      :state="mr.state"
-                      :related-links="mr.relatedLinks"
-                      :show-assign-to-me="false"
-                      class="mr-ready-merge-related-links gl-display-inline"
-                    />
-                  </li>
-                </ul>
-              </div>
-              <div
-                v-else
-                :class="{ 'gl-mb-5': restructuredWidgetShowMergeButtons }"
-                class="gl-w-full gl-order-n1 gl-text-gray-500"
-              >
-                <added-commit-message
-                  :is-squash-enabled="squashBeforeMerge"
-                  :is-fast-forward-enabled="!shouldShowMergeEdit"
-                  :commits-count="commitsCount"
-                  :target-branch="stateData.targetBranch"
-                />
-                <template v-if="mr.relatedLinks">
-                  &middot;
+                </li>
+                <li v-if="mr.state !== 'closed'" class="gl-line-height-normal">
+                  {{ sourceBranchDeletedText }}
+                </li>
+                <li v-if="mr.relatedLinks" class="gl-line-height-normal">
                   <related-links
                     :state="mr.state"
                     :related-links="mr.relatedLinks"
                     :show-assign-to-me="false"
-                    :diverged-commits-count="mr.divergedCommitsCount"
-                    :target-branch-path="mr.targetBranchPath"
                     class="mr-ready-merge-related-links gl-display-inline"
                   />
-                </template>
-              </div>
-            </template>
-          </div>
-          <div
-            v-if="showDangerMessageForMergeTrain && !glFeatures.restructuredMrWidget"
-            class="gl-mt-5 gl-text-gray-500"
-            data-testid="failed-pipeline-merge-train-text"
-          >
-            {{ __('The latest pipeline for this merge request did not complete successfully.') }}
+                </li>
+              </ul>
+            </div>
+            <div
+              v-else
+              :class="{ 'gl-mb-5': shouldShowMergeControls }"
+              class="gl-w-full gl-order-n1 gl-text-gray-500"
+            >
+              <added-commit-message
+                :is-squash-enabled="squashBeforeMerge"
+                :is-fast-forward-enabled="!shouldShowMergeEdit"
+                :commits-count="commitsCount"
+                :target-branch="stateData.targetBranch"
+              />
+              <template v-if="mr.relatedLinks">
+                &middot;
+                <related-links
+                  :state="mr.state"
+                  :related-links="mr.relatedLinks"
+                  :show-assign-to-me="false"
+                  :diverged-commits-count="mr.divergedCommitsCount"
+                  :target-branch-path="mr.targetBranchPath"
+                  class="mr-ready-merge-related-links gl-display-inline"
+                />
+              </template>
+            </div>
           </div>
         </div>
       </div>
-      <template v-if="shouldShowMergeControls && !glFeatures.restructuredMrWidget">
-        <div v-if="!shouldShowMergeEdit" class="mr-fast-forward-message">
-          {{ __('Fast-forward merge without a merge commit') }}
-        </div>
-        <commits-header
-          v-if="!glFeatures.restructuredMrWidget && (shouldShowSquashEdit || shouldShowMergeEdit)"
-          :is-squash-enabled="squashBeforeMerge"
-          :commits-count="commitsCount"
-          :target-branch="stateData.targetBranch"
-          :is-fast-forward-enabled="!shouldShowMergeEdit"
-          :class="{ 'border-bottom': stateData.mergeError }"
-        >
-          <ul class="border-top content-list commits-list flex-list">
-            <commit-edit
-              v-if="shouldShowSquashEdit"
-              :value="squashCommitMessage"
-              :label="__('Squash commit message')"
-              input-id="squash-message-edit"
-              squash
-              @input="setSquashCommitMessage"
-            >
-              <template #header>
-                <commit-message-dropdown :commits="commits" @input="setSquashCommitMessage" />
-              </template>
-            </commit-edit>
-            <commit-edit
-              v-if="shouldShowMergeEdit"
-              :value="commitMessage"
-              :label="__('Merge commit message')"
-              input-id="merge-message-edit"
-              @input="setCommitMessage"
-            />
-            <li>
-              <p class="form-text text-muted">
-                <gl-sprintf :message="commitTemplateHintText">
-                  <template #link="{ content }">
-                    <gl-link :href="commitTemplateHelpPage" class="inline-link" target="_blank">
-                      {{ content }}
-                    </gl-link>
-                  </template>
-                </gl-sprintf>
-              </p>
-            </li>
-          </ul>
-        </commits-header>
-      </template>
     </template>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue
index b1fbe150fcf..06f70bc456e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/sha_mismatch.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlButton } from '@gitlab/ui';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { I18N_SHA_MISMATCH } from '../../i18n';
 import statusIcon from '../mr_widget_status_icon.vue';
 
@@ -13,7 +12,6 @@ export default {
   i18n: {
     I18N_SHA_MISMATCH,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     mr: {
       type: Object,
@@ -28,8 +26,7 @@ export default {
     <status-icon :show-disabled-button="false" status="warning" />
     <div class="media-body">
       <span
-        :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }"
-        class="gl-font-weight-bold"
+        class="gl-ml-0! gl-text-body! gl-font-weight-bold"
         data-qa-selector="head_mismatch_content"
       >
         {{ $options.i18n.I18N_SHA_MISMATCH.warningMessage }}
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
index c6227c4394d..1413a46b4b9 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlIcon, GlTooltipDirective, GlFormCheckbox, GlLink } from '@gitlab/ui';
-import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { SQUASH_BEFORE_MERGE } from '../../i18n';
 
 export default {
@@ -12,7 +11,6 @@ export default {
   directives: {
     GlTooltip: GlTooltipDirective,
   },
-  mixins: [glFeatureFlagsMixin()],
   i18n: {
     ...SQUASH_BEFORE_MERGE,
   },
@@ -36,9 +34,6 @@ export default {
     tooltipTitle() {
       return this.isDisabled ? this.$options.i18n.tooltipTitle : null;
     },
-    helpIconName() {
-      return this.glFeatures.restructuredMrWidget ? 'question-o' : 'question';
-    },
   },
 };
 </script>
@@ -62,10 +57,10 @@ export default {
       v-gl-tooltip
       :href="helpPath"
       :title="$options.i18n.helpLabel"
-      :class="{ 'gl-text-blue-600': glFeatures.restructuredMrWidget }"
+      class="gl-text-blue-600"
       target="_blank"
     >
-      <gl-icon :name="helpIconName" />
+      <gl-icon name="question-o" />
       <span class="sr-only">
         {{ $options.i18n.helpLabel }}
       </span>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
index 25ba4bf12af..7e9ebcf0b2e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/unresolved_discussions.vue
@@ -1,6 +1,5 @@
 <script>
 import { GlButton } from '@gitlab/ui';
-import glFeatureFlagMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import notesEventHub from '~/notes/event_hub';
 import statusIcon from '../mr_widget_status_icon.vue';
 
@@ -10,7 +9,6 @@ export default {
     statusIcon,
     GlButton,
   },
-  mixins: [glFeatureFlagMixin()],
   props: {
     mr: {
       type: Object,
@@ -29,22 +27,15 @@ export default {
   <div class="mr-widget-body media gl-flex-wrap">
     <status-icon show-disabled-button status="warning" />
     <div class="media-body">
-      <span
-        :class="{
-          'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget,
-          'gl-display-block': !glFeatures.restructuredMrWidget,
-        }"
-        class="gl-ml-3 gl-font-weight-bold gl-w-100"
-      >
+      <span class="gl-ml-0! gl-text-body! gl-ml-3 gl-font-weight-bold gl-w-100">
         {{ s__('mrWidget|Merge blocked: all threads must be resolved.') }}
       </span>
       <gl-button
         data-testid="jump-to-first"
         class="gl-ml-3"
         size="small"
-        :icon="glFeatures.restructuredMrWidget ? undefined : 'comment-next'"
-        :variant="glFeatures.restructuredMrWidget ? 'confirm' : 'default'"
-        :category="glFeatures.restructuredMrWidget ? 'secondary' : 'primary'"
+        variant="confirm"
+        category="secondary"
         @click="jumpToFirstUnresolvedDiscussion"
       >
         {{ s__('mrWidget|Jump to first unresolved thread') }}
@@ -54,7 +45,6 @@ export default {
         :href="mr.createIssueToResolveDiscussionsPath"
         class="js-create-issue gl-ml-3"
         size="small"
-        :icon="glFeatures.restructuredMrWidget ? undefined : 'issue-new'"
       >
         {{ s__('mrWidget|Create issue to resolve all threads') }}
       </gl-button>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
index 5bd7745d704..501aee1a18d 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/work_in_progress.vue
@@ -167,10 +167,7 @@ export default {
     <status-icon :show-disabled-button="canUpdate" status="warning" />
     <div class="media-body">
       <div class="float-left">
-        <span
-          :class="{ 'gl-ml-0! gl-text-body!': glFeatures.restructuredMrWidget }"
-          class="gl-font-weight-bold"
-        >
+        <span class="gl-ml-0! gl-text-body! gl-font-weight-bold">
           {{
             __("Merge blocked: merge request must be marked as ready. It's still marked as draft.")
           }}
diff --git a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
index 627ddb0445e..d964b4bacac 100644
--- a/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
+++ b/app/assets/javascripts/vue_merge_request_widget/mixins/ready_to_merge.js
@@ -20,13 +20,6 @@ export default {
           this.mr.preventMerge,
       );
     },
-    shouldShowMergeControls() {
-      if (this.glFeatures.restructuredMrWidget) {
-        return this.restructuredWidgetShowMergeButtons;
-      }
-
-      return this.isMergeAllowed || this.isAutoMergeAvailable;
-    },
     mergeDisabledText() {
       if (this.pipeline?.status === PIPELINE_SKIPPED_STATUS) {
         return MERGE_DISABLED_SKIPPED_PIPELINE_TEXT;
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 3e0ac236fdf..0edd44d835e 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
@@ -17,7 +17,6 @@ import { setFaviconOverlay } from '../lib/utils/favicon';
 import Loading from './components/loading.vue';
 import MrWidgetAlertMessage from './components/mr_widget_alert_message.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';
 import SourceBranchRemovalStatus from './components/source_branch_removal_status.vue';
 import ArchivedState from './components/states/mr_widget_archived.vue';
@@ -61,7 +60,6 @@ export default {
     ExtensionsContainer,
     'mr-widget-suggest-pipeline': WidgetSuggestPipeline,
     MrWidgetPipelineContainer,
-    'mr-widget-related-links': WidgetRelatedLinks,
     MrWidgetAlertMessage,
     'mr-widget-merged': MergedState,
     'mr-widget-closed': ClosedState,
@@ -73,9 +71,7 @@ export default {
     'mr-widget-nothing-to-merge': NothingToMergeState,
     'mr-widget-not-allowed': NotAllowedState,
     'mr-widget-missing-branch': MissingBranchState,
-    'mr-widget-ready-to-merge': window.gon?.features?.restructuredMrWidget
-      ? () => import('./components/states/new_ready_to_merge.vue')
-      : ReadyToMergeState,
+    'mr-widget-ready-to-merge': () => import('./components/states/new_ready_to_merge.vue'),
     'sha-mismatch': ShaMismatch,
     'mr-widget-checking': CheckingState,
     'mr-widget-unresolved-discussions': UnresolvedDiscussionsState,
@@ -163,12 +159,6 @@ export default {
     shouldRenderCodeQuality() {
       return this.mr?.codequalityReportsPath;
     },
-    shouldRenderRelatedLinks() {
-      return (
-        (Boolean(this.mr.relatedLinks) || this.mr.divergedCommitsCount > 0) &&
-        !this.mr.isNothingToMergeState
-      );
-    },
     shouldRenderSourceBranchRemovalStatus() {
       return (
         !this.mr.canRemoveSourceBranch &&
@@ -239,9 +229,6 @@ export default {
     shouldShowCodeQualityExtension() {
       return window.gon?.features?.refactorCodeQualityExtension;
     },
-    isRestructuredMrWidgetEnabled() {
-      return window.gon?.features?.restructuredMrWidget;
-    },
   },
   watch: {
     'mr.machineValue': {
@@ -638,23 +625,7 @@ export default {
 
       <div class="mr-widget-section" data-qa-selector="mr_widget_content">
         <component :is="componentName" :mr="mr" :service="service" />
-        <ready-to-merge
-          v-if="isRestructuredMrWidgetEnabled && mr.commitsCount"
-          :mr="mr"
-          :service="service"
-        />
-        <div v-else class="mr-widget-info">
-          <mr-widget-related-links
-            v-if="shouldRenderRelatedLinks"
-            :state="mr.state"
-            :related-links="mr.relatedLinks"
-            :diverged-commits-count="mr.divergedCommitsCount"
-            :target-branch-path="mr.targetBranchPath"
-            class="mr-info-list gl-ml-7 gl-pb-5"
-          />
-
-          <source-branch-removal-status v-if="shouldRenderSourceBranchRemovalStatus" />
-        </div>
+        <ready-to-merge v-if="mr.commitsCount" :mr="mr" :service="service" />
       </div>
     </div>
     <mr-widget-pipeline-container
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
index 18d955652ba..7a458f9ce7e 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/get_state_key.js
@@ -27,8 +27,6 @@ export default function deviseState() {
     return stateKey.shaMismatch;
   } else if (this.autoMergeEnabled && !this.mergeError) {
     return stateKey.autoMergeEnabled;
-  } else if (!this.canMerge && !window.gon?.features?.restructuredMrWidget) {
-    return stateKey.notAllowedToMerge;
   } else if (this.canBeMerged) {
     return stateKey.readyToMerge;
   }