Add latest changes from gitlab-org/gitlab@master

2 files changed, 2 insertions, 17 deletions

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index c86f2c8451c..2fc981f24b7 100644
--- a/app/assets/javascripts/diffs/components/app.vue
+++ b/app/assets/javascripts/diffs/components/app.vue
@@ -17,7 +17,6 @@ import { helpPagePath } from '~/helpers/help_page_helper';
 import { parseBoolean } from '~/lib/utils/common_utils';
 import { updateHistory } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
-import MrWidgetHowToMergeModal from '~/vue_merge_request_widget/components/mr_widget_how_to_merge_modal.vue';
 import PanelResizer from '~/vue_shared/components/panel_resizer.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 
@@ -75,7 +74,6 @@ export default {
     PanelResizer,
     GlPagination,
     GlSprintf,
-    MrWidgetHowToMergeModal,
     GlAlert,
   },
   mixins: [glFeatureFlagsMixin()],
@@ -738,15 +736,6 @@ export default {
           />
         </div>
       </div>
-      <mr-widget-how-to-merge-modal
-        :is-fork="isForked"
-        :can-merge="canMerge"
-        :source-branch="branchName"
-        :source-project-path="sourceProjectFullPath"
-        :target-branch="targetBranchName"
-        :source-project-default-url="sourceProjectDefaultUrl"
-        :reviewing-docs-path="$options.howToMergeDocsPath"
-      />
     </div>
   </div>
 </template>
diff --git a/app/assets/javascripts/diffs/components/diff_file.vue b/app/assets/javascripts/diffs/components/diff_file.vue
index d8f27a967df..5a78cc1b23c 100644
--- a/app/assets/javascripts/diffs/components/diff_file.vue
+++ b/app/assets/javascripts/diffs/components/diff_file.vue
@@ -5,7 +5,6 @@ import {
   GlSafeHtmlDirective as SafeHtml,
   GlSprintf,
   GlAlert,
-  GlModalDirective,
 } from '@gitlab/ui';
 import { escape } from 'lodash';
 import { mapActions, mapGetters, mapState } from 'vuex';
@@ -42,7 +41,6 @@ export default {
   },
   directives: {
     SafeHtml,
-    GlModalDirective,
   },
   mixins: [glFeatureFlagsMixin(), IdState({ idProp: (vm) => vm.file.file_hash })],
   props: {
@@ -430,9 +428,8 @@ export default {
               </template>
               <template #resolveLocally="{ content }">
                 <gl-button
-                  v-gl-modal-directive="'modal-merge-info'"
                   variant="link"
-                  class="gl-vertical-align-text-bottom"
+                  class="gl-vertical-align-text-bottom js-check-out-modal-trigger"
                   >{{ content }}</gl-button
                 >
               </template>
@@ -443,9 +440,8 @@ export default {
             >
               <template #resolveLocally="{ content }">
                 <gl-button
-                  v-gl-modal-directive="'modal-merge-info'"
                   variant="link"
-                  class="gl-vertical-align-text-bottom"
+                  class="gl-vertical-align-text-bottom js-check-out-modal-trigger"
                   >{{ content }}</gl-button
                 >
               </template>