Add latest changes from gitlab-org/gitlab@15-0-stable-eev15.0.0-rc42

1 files changed, 1 insertions, 12 deletions

diff --git a/app/assets/javascripts/diffs/components/app.vue b/app/assets/javascripts/diffs/components/app.vue
index c86f2c8451c..c3436159cea 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()],
@@ -373,7 +371,7 @@ export default {
       events.push(TRACKING_MULTIPLE_FILES_MODE);
     }
 
-    queueRedisHllEvents(events);
+    queueRedisHllEvents(events, { verifyCap: true });
 
     this.subscribeToVirtualScrollingEvents();
   },
@@ -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>