Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

.rubocop_todo/capybara/visibility_matcher.yml

@@ -34,7 +34,6 @@ Capybara/VisibilityMatcher:
     - 'spec/features/merge_request/user_views_diffs_commit_spec.rb'
     - 'spec/features/merge_request/user_views_diffs_spec.rb'
     - 'spec/features/projects/blobs/blob_show_spec.rb'
-    - 'spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb'
     - 'spec/features/projects/ci/lint_spec.rb'
     - 'spec/features/projects/commit/comments/user_adds_comment_spec.rb'
     - 'spec/features/projects/commits/multi_view_diff_spec.rb'

.rubocop_todo/layout/line_length.yml

@@ -3117,7 +3117,6 @@ Layout/LineLength:
     - 'spec/features/projects/blobs/blob_show_spec.rb'
     - 'spec/features/projects/blobs/edit_spec.rb'
     - 'spec/features/projects/blobs/shortcuts_blob_spec.rb'
-    - 'spec/features/projects/blobs/user_follows_pipeline_suggest_nudge_spec.rb'
     - 'spec/features/projects/blobs/user_views_pipeline_editor_button_spec.rb'
     - 'spec/features/projects/ci/editor_spec.rb'
     - 'spec/features/projects/commit/cherry_pick_spec.rb'

app/assets/javascripts/blob/filepath_form/components/filepath_form.vue

@@ -21,11 +21,6 @@ export default {
       type: Object,
       required: true,
     },
-    suggestCiYmlData: {
-      type: Object,
-      required: false,
-      default: undefined,
-    },
   },
   data() {
     return {
@@ -56,7 +51,6 @@ export default {
       :filename="filename"
       :templates="templates"
       :initial-template="initialTemplate"
-      :suggest-ci-yml-data="suggestCiYmlData"
       @selected="onTemplateSelected"
     />
   </div>

app/assets/javascripts/blob/filepath_form/components/template_selector.vue

@@ -1,6 +1,5 @@
 <script>
 import { GlCollapsibleListbox } from '@gitlab/ui';
-import SuggestGitlabCiYml from '~/blob/suggest_gitlab_ci_yml/components/popover.vue';
 import { __ } from '~/locale';
 import { DEFAULT_CI_CONFIG_PATH, CI_CONFIG_PATH_EXTENSION } from '~/lib/utils/constants';
 
@@ -34,7 +33,6 @@ const templateSelectors = [
 export default {
   name: 'TemplateSelector',
   components: {
-    SuggestGitlabCiYml,
     GlCollapsibleListbox,
   },
   props: {
@@ -51,11 +49,6 @@ export default {
       required: false,
       default: undefined,
     },
-    suggestCiYmlData: {
-      type: Object,
-      required: false,
-      default: undefined,
-    },
   },
   data() {
     return {
@@ -97,9 +90,6 @@ export default {
     showDropdown() {
       return this.activeType && this.templateItems.length > 0;
     },
-    showPopover() {
-      return this.activeType?.key === 'gitlab_ci_ymls' && this.suggestCiYmlData;
-    },
   },
   beforeMount() {
     if (this.activeType) this.applyTemplate(this.initialTemplate);
@@ -135,14 +125,6 @@ export default {
 </script>
 <template>
   <div v-if="showDropdown">
-    <suggest-gitlab-ci-yml
-      v-if="showPopover"
-      target="template-selector"
-      :track-label="suggestCiYmlData.trackLabel"
-      :dismiss-key="suggestCiYmlData.dismissKey"
-      :merge-request-path="suggestCiYmlData.mergeRequestPath"
-      :human-access="suggestCiYmlData.humanAccess"
-    />
     <gl-collapsible-listbox
       id="template-selector"
       searchable

app/assets/javascripts/blob/filepath_form/index.js

@@ -1,13 +1,6 @@
 import Vue from 'vue';
 import FilepathForm from './components/filepath_form.vue';
 
-const getPopoverData = (el) => ({
-  trackLabel: el.dataset.trackLabel,
-  dismissKey: el.dataset.dismissKey,
-  mergeRequestPath: el.dataset.mergeRequestPath,
-  humanAccess: el.dataset.humanAccess,
-});
-
 const getInputOptions = (el) => {
   const { testid, qa_selector: qaSelector, ...options } = JSON.parse(el.dataset.inputOptions);
   return {
@@ -19,15 +12,11 @@ const getInputOptions = (el) => {
 export default ({ onTemplateSelected }) => {
   const el = document.getElementById('js-template-selectors-menu');
 
-  const suggestCiYmlEl = document.querySelector('.js-suggest-gitlab-ci-yml');
-  const suggestCiYmlData = suggestCiYmlEl ? getPopoverData(suggestCiYmlEl) : undefined;
-
   return new Vue({
     el,
     render(h) {
       return h(FilepathForm, {
         props: {
-          suggestCiYmlData,
           inputOptions: getInputOptions(el),
           templates: JSON.parse(el.dataset.templates),
           initialTemplate: el.dataset.selected,

app/assets/javascripts/blob/filepath_form_mediator.js

@@ -1,7 +1,6 @@
 import $ from 'jquery';
 
 import Api from '~/api';
-import initPopover from '~/blob/suggest_gitlab_ci_yml';
 import { createAlert } from '~/alert';
 import { __, sprintf } from '~/locale';
 import toast from '~/vue_shared/plugins/global_toast';
@@ -33,7 +32,6 @@ export default class FilepathFormMediator {
 
   selectTemplateFile(template, type, clearSelectedTemplate, stopLoading) {
     const self = this;
-    const suggestCommitChanges = document.querySelector('.js-suggest-gitlab-ci-yml-commit-changes');
 
     this.fetchFileTemplate(type.type, template.key, template)
       .then((file) => {
@@ -50,10 +48,6 @@ export default class FilepathFormMediator {
             },
           },
         });
-
-        if (suggestCommitChanges) {
-          initPopover(suggestCommitChanges);
-        }
       })
       .catch((err) =>
         createAlert({