Add latest changes from gitlab-org/gitlab@master

196 files changed, 2369 insertions, 382 deletions

diff --git a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
index f89600fbed3..fe801cd460f 100644
--- a/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
+++ b/app/assets/javascripts/authentication/two_factor_auth/components/recovery_codes.vue
@@ -165,7 +165,7 @@ export default {
           :title="$options.i18n.proceedButton"
           variant="confirm"
           data-qa-selector="proceed_button"
-          data-track-event="click_button"
+          data-track-action="click_button"
           :data-track-label="`${$options.trackingLabelPrefix}proceed_button`"
           >{{ $options.i18n.proceedButton }}</gl-button
         >
diff --git a/app/assets/javascripts/blob/pipeline_tour_success_modal.vue b/app/assets/javascripts/blob/pipeline_tour_success_modal.vue
index fdaa4b082f7..a3278f8bde2 100644
--- a/app/assets/javascripts/blob/pipeline_tour_success_modal.vue
+++ b/app/assets/javascripts/blob/pipeline_tour_success_modal.vue
@@ -124,7 +124,7 @@ export default {
         :href="goToMergeRequestPath"
         :data-track-property="humanAccess"
         :data-track-value="$options.goToTrackValueMergeRequest"
-        :data-track-event="$options.trackEvent"
+        :data-track-action="$options.trackEvent"
         :data-track-label="trackLabel"
       >
         {{ $options.i18n.mergeRequestButton }}
@@ -135,7 +135,7 @@ export default {
         variant="success"
         :data-track-property="humanAccess"
         :data-track-value="$options.goToTrackValuePipelines"
-        :data-track-event="$options.trackEvent"
+        :data-track-action="$options.trackEvent"
         :data-track-label="trackLabel"
       >
         {{ $options.i18n.pipelinesButton }}
diff --git a/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue b/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue
index aee8bf15e44..e0b0857f7b4 100644
--- a/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue
+++ b/app/assets/javascripts/blob/suggest_gitlab_ci_yml/components/popover.vue
@@ -121,7 +121,7 @@ export default {
           icon="close"
           :data-track-property="humanAccess"
           :data-track-value="$options.dismissTrackValue"
-          :data-track-event="$options.clickTrackValue"
+          :data-track-action="$options.clickTrackValue"
           :data-track-label="trackLabel"
           @click="onDismiss"
         />
diff --git a/app/assets/javascripts/deprecated_jquery_dropdown/render.js b/app/assets/javascripts/deprecated_jquery_dropdown/render.js
index 167bc4c286e..37287b9d981 100644
--- a/app/assets/javascripts/deprecated_jquery_dropdown/render.js
+++ b/app/assets/javascripts/deprecated_jquery_dropdown/render.js
@@ -107,7 +107,7 @@ function createLink(data, selected, options, index) {
   }
 
   if (options.trackSuggestionClickedLabel) {
-    link.setAttribute('data-track-event', 'click_text');
+    link.setAttribute('data-track-action', 'click_text');
     link.setAttribute('data-track-label', options.trackSuggestionClickedLabel);
     link.setAttribute('data-track-value', index);
     link.setAttribute('data-track-property', slugify(data.category || 'no-category'));
diff --git a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue
index 336ce714a05..818299e36bd 100644
--- a/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue
+++ b/app/assets/javascripts/design_management/components/design_notes/design_reply_form.vue
@@ -123,7 +123,7 @@ export default {
         category="primary"
         variant="confirm"
         type="submit"
-        data-track-event="click_button"
+        data-track-action="click_button"
         data-qa-selector="save_comment_button"
         @click="$emit('submit-form')"
       >
diff --git a/app/assets/javascripts/diffs/components/diff_file_header.vue b/app/assets/javascripts/diffs/components/diff_file_header.vue
index 667b8745f7b..4bcb99424db 100644
--- a/app/assets/javascripts/diffs/components/diff_file_header.vue
+++ b/app/assets/javascripts/diffs/components/diff_file_header.vue
@@ -341,7 +341,7 @@ export default {
         :gfm="gfmCopyText"
         data-testid="diff-file-copy-clipboard"
         category="tertiary"
-        data-track-event="click_copy_file_button"
+        data-track-action="click_copy_file_button"
         data-track-label="diff_copy_file_path_button"
         data-track-property="diff_copy_file"
       />
@@ -382,7 +382,7 @@ export default {
           :title="externalUrlLabel"
           :aria-label="externalUrlLabel"
           target="_blank"
-          data-track-event="click_toggle_external_button"
+          data-track-action="click_toggle_external_button"
           data-track-label="diff_toggle_external_button"
           data-track-property="diff_toggle_external"
           icon="external-link"
diff --git a/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue b/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue
index dde021b67be..05d557db942 100644
--- a/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue
+++ b/app/assets/javascripts/feature_flags/components/edit_feature_flag.vue
@@ -48,7 +48,7 @@ export default {
         <gl-toggle
           :value="active"
           data-testid="feature-flag-status-toggle"
-          data-track-event="click_button"
+          data-track-action="click_button"
           data-track-label="feature_flag_toggle"
           class="gl-mr-4"
           :label="__('Feature flag status')"
diff --git a/app/assets/javascripts/feature_flags/components/feature_flags_table.vue b/app/assets/javascripts/feature_flags/components/feature_flags_table.vue
index cfd838bf5a1..f8a8bed2467 100644
--- a/app/assets/javascripts/feature_flags/components/feature_flags_table.vue
+++ b/app/assets/javascripts/feature_flags/components/feature_flags_table.vue
@@ -115,7 +115,7 @@ export default {
               :label="$options.i18n.toggleLabel"
               label-position="hidden"
               data-testid="feature-flag-status-toggle"
-              data-track-event="click_button"
+              data-track-action="click_button"
               data-track-label="feature_flag_toggle"
               @change="toggleFeatureFlag(featureFlag)"
             />
diff --git a/app/assets/javascripts/header_search/components/app.vue b/app/assets/javascripts/header_search/components/app.vue
index cdec3d8eec3..580c27f6c61 100644
--- a/app/assets/javascripts/header_search/components/app.vue
+++ b/app/assets/javascripts/header_search/components/app.vue
@@ -1,7 +1,10 @@
 <script>
 import { GlSearchBoxByType, GlOutsideDirective as Outside } from '@gitlab/ui';
+import { mapState, mapActions, mapGetters } from 'vuex';
+import { visitUrl } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
 import HeaderSearchDefaultItems from './header_search_default_items.vue';
+import HeaderSearchScopedItems from './header_search_scoped_items.vue';
 
 export default {
   name: 'HeaderSearchApp',
@@ -12,6 +15,7 @@ export default {
   components: {
     GlSearchBoxByType,
     HeaderSearchDefaultItems,
+    HeaderSearchScopedItems,
   },
   data() {
     return {
@@ -19,17 +23,34 @@ export default {
     };
   },
   computed: {
+    ...mapState(['search']),
+    ...mapGetters(['searchQuery']),
+    searchText: {
+      get() {
+        return this.search;
+      },
+      set(value) {
+        this.setSearch(value);
+      },
+    },
     showSearchDropdown() {
       return this.showDropdown && gon?.current_username;
     },
+    showDefaultItems() {
+      return !this.searchText;
+    },
   },
   methods: {
+    ...mapActions(['setSearch']),
     openDropdown() {
       this.showDropdown = true;
     },
     closeDropdown() {
       this.showDropdown = false;
     },
+    submitSearch() {
+      return visitUrl(this.searchQuery);
+    },
   },
 };
 </script>
@@ -37,10 +58,13 @@ export default {
 <template>
   <section v-outside="closeDropdown" class="header-search gl-relative">
     <gl-search-box-by-type
+      v-model="searchText"
+      :debounce="500"
       autocomplete="off"
       :placeholder="$options.i18n.searchPlaceholder"
       @focus="openDropdown"
       @click="openDropdown"
+      @keydown.enter="submitSearch"
       @keydown.esc="closeDropdown"
     />
     <div
@@ -49,7 +73,10 @@ export default {
       class="header-search-dropdown-menu gl-overflow-y-auto gl-absolute gl-left-0 gl-z-index-1 gl-w-full gl-bg-white gl-border-1 gl-rounded-base gl-border-solid gl-border-gray-200 gl-shadow-x0-y2-b4-s0"
     >
       <div class="header-search-dropdown-content gl-overflow-y-auto gl-py-2">
-        <header-search-default-items />
+        <header-search-default-items v-if="showDefaultItems" />
+        <template v-else>
+          <header-search-scoped-items />
+        </template>
       </div>
     </div>
   </section>
diff --git a/app/assets/javascripts/header_search/components/header_search_scoped_items.vue b/app/assets/javascripts/header_search/components/header_search_scoped_items.vue
new file mode 100644
index 00000000000..645eba05148
--- /dev/null
+++ b/app/assets/javascripts/header_search/components/header_search_scoped_items.vue
@@ -0,0 +1,31 @@
+<script>
+import { GlDropdownItem } from '@gitlab/ui';
+import { mapState, mapGetters } from 'vuex';
+
+export default {
+  name: 'HeaderSearchScopedItems',
+  components: {
+    GlDropdownItem,
+  },
+  computed: {
+    ...mapState(['search']),
+    ...mapGetters(['scopedSearchOptions']),
+  },
+};
+</script>
+
+<template>
+  <div>
+    <gl-dropdown-item
+      v-for="(option, index) in scopedSearchOptions"
+      :id="`scoped-${index}`"
+      :key="index"
+      tabindex="-1"
+      :href="option.url"
+    >
+      "<span class="gl-font-weight-bold">{{ search }}</span
+      >" {{ option.description }}
+      <span v-if="option.scope" class="gl-font-style-italic">{{ option.scope }}</span>
+    </gl-dropdown-item>
+  </div>
+</template>
diff --git a/app/assets/javascripts/header_search/constants.js b/app/assets/javascripts/header_search/constants.js
index 64e56156c2f..fffed7bcbdb 100644
--- a/app/assets/javascripts/header_search/constants.js
+++ b/app/assets/javascripts/header_search/constants.js
@@ -9,3 +9,9 @@ export const MSG_MR_ASSIGNED_TO_ME = __('Merge requests assigned to me');
 export const MSG_MR_IM_REVIEWER = __("Merge requests that I'm a reviewer");
 
 export const MSG_MR_IVE_CREATED = __("Merge requests I've created");
+
+export const MSG_IN_ALL_GITLAB = __('in all GitLab');
+
+export const MSG_IN_GROUP = __('in group');
+
+export const MSG_IN_PROJECT = __('in project');
diff --git a/app/assets/javascripts/header_search/index.js b/app/assets/javascripts/header_search/index.js
index 0881db16be3..2d37ee137fc 100644
--- a/app/assets/javascripts/header_search/index.js
+++ b/app/assets/javascripts/header_search/index.js
@@ -12,13 +12,13 @@ export const initHeaderSearchApp = () => {
     return false;
   }
 
-  const { issuesPath, mrPath } = el.dataset;
+  const { searchPath, issuesPath, mrPath } = el.dataset;
   let { searchContext } = el.dataset;
   searchContext = JSON.parse(searchContext);
 
   return new Vue({
     el,
-    store: createStore({ issuesPath, mrPath, searchContext }),
+    store: createStore({ searchPath, issuesPath, mrPath, searchContext }),
     render(createElement) {
       return createElement(HeaderSearchApp);
     },
diff --git a/app/assets/javascripts/header_search/store/actions.js b/app/assets/javascripts/header_search/store/actions.js
new file mode 100644
index 00000000000..841aee04029
--- /dev/null
+++ b/app/assets/javascripts/header_search/store/actions.js
@@ -0,0 +1,5 @@
+import * as types from './mutation_types';
+
+export const setSearch = ({ commit }, value) => {
+  commit(types.SET_SEARCH, value);
+};
diff --git a/app/assets/javascripts/header_search/store/getters.js b/app/assets/javascripts/header_search/store/getters.js
index 1feb0e519ba..d1e1fc8ad73 100644
--- a/app/assets/javascripts/header_search/store/getters.js
+++ b/app/assets/javascripts/header_search/store/getters.js
@@ -1,11 +1,28 @@
+import { objectToQuery } from '~/lib/utils/url_utility';
+
 import {
   MSG_ISSUES_ASSIGNED_TO_ME,
   MSG_ISSUES_IVE_CREATED,
   MSG_MR_ASSIGNED_TO_ME,
   MSG_MR_IM_REVIEWER,
   MSG_MR_IVE_CREATED,
+  MSG_IN_PROJECT,
+  MSG_IN_GROUP,
+  MSG_IN_ALL_GITLAB,
 } from '../constants';
 
+export const searchQuery = (state) => {
+  const query = {
+    search: state.search,
+    nav_source: 'navbar',
+    project_id: state.searchContext.project?.id,
+    group_id: state.searchContext.group?.id,
+    scope: state.searchContext.scope,
+  };
+
+  return `${state.searchPath}?${objectToQuery(query)}`;
+};
+
 export const scopedIssuesPath = (state) => {
   return (
     state.searchContext.project_metadata?.issues_path ||
@@ -48,3 +65,71 @@ export const defaultSearchOptions = (state, getters) => {
     },
   ];
 };
+
+export const projectUrl = (state) => {
+  if (!state.searchContext.project || !state.searchContext.group) {
+    return null;
+  }
+
+  const query = {
+    search: state.search,
+    nav_source: 'navbar',
+    project_id: state.searchContext.project.id,
+    group_id: state.searchContext.group.id,
+    scope: state.searchContext.scope,
+  };
+
+  return `${state.searchPath}?${objectToQuery(query)}`;
+};
+
+export const groupUrl = (state) => {
+  if (!state.searchContext.group) {
+    return null;
+  }
+
+  const query = {
+    search: state.search,
+    nav_source: 'navbar',
+    group_id: state.searchContext.group.id,
+    scope: state.searchContext.scope,
+  };
+
+  return `${state.searchPath}?${objectToQuery(query)}`;
+};
+
+export const allUrl = (state) => {
+  const query = {
+    search: state.search,
+    nav_source: 'navbar',
+    scope: state.searchContext.scope,
+  };
+
+  return `${state.searchPath}?${objectToQuery(query)}`;
+};
+
+export const scopedSearchOptions = (state, getters) => {
+  const options = [];
+
+  if (state.searchContext.project) {
+    options.push({
+      scope: state.searchContext.project.name,
+      description: MSG_IN_PROJECT,
+      url: getters.projectUrl,
+    });
+  }
+
+  if (state.searchContext.group) {
+    options.push({
+      scope: state.searchContext.group.name,
+      description: MSG_IN_GROUP,
+      url: getters.groupUrl,
+    });
+  }
+
+  options.push({
+    description: MSG_IN_ALL_GITLAB,
+    url: getters.allUrl,
+  });
+
+  return options;
+};
diff --git a/app/assets/javascripts/header_search/store/index.js b/app/assets/javascripts/header_search/store/index.js
index 066e02aed9f..8b74f8662a5 100644
--- a/app/assets/javascripts/header_search/store/index.js
+++ b/app/assets/javascripts/header_search/store/index.js
@@ -1,13 +1,17 @@
 import Vue from 'vue';
 import Vuex from 'vuex';
+import * as actions from './actions';
 import * as getters from './getters';
+import mutations from './mutations';
 import createState from './state';
 
 Vue.use(Vuex);
 
-export const getStoreConfig = ({ issuesPath, mrPath, searchContext }) => ({
+export const getStoreConfig = ({ searchPath, issuesPath, mrPath, searchContext }) => ({
+  actions,
   getters,
-  state: createState({ issuesPath, mrPath, searchContext }),
+  mutations,
+  state: createState({ searchPath, issuesPath, mrPath, searchContext }),
 });
 
 const createStore = (config) => new Vuex.Store(getStoreConfig(config));
diff --git a/app/assets/javascripts/header_search/store/mutation_types.js b/app/assets/javascripts/header_search/store/mutation_types.js
new file mode 100644
index 00000000000..0bc94ae055f
--- /dev/null
+++ b/app/assets/javascripts/header_search/store/mutation_types.js
@@ -0,0 +1 @@
+export const SET_SEARCH = 'SET_SEARCH';
diff --git a/app/assets/javascripts/header_search/store/mutations.js b/app/assets/javascripts/header_search/store/mutations.js
new file mode 100644
index 00000000000..5b1438929d4
--- /dev/null
+++ b/app/assets/javascripts/header_search/store/mutations.js
@@ -0,0 +1,7 @@
+import * as types from './mutation_types';
+
+export default {
+  [types.SET_SEARCH](state, value) {
+    state.search = value;
+  },
+};
diff --git a/app/assets/javascripts/header_search/store/state.js b/app/assets/javascripts/header_search/store/state.js
index 94a238a24ee..fb2c83dbbe3 100644
--- a/app/assets/javascripts/header_search/store/state.js
+++ b/app/assets/javascripts/header_search/store/state.js
@@ -1,6 +1,8 @@
-const createState = ({ issuesPath, mrPath, searchContext }) => ({
+const createState = ({ searchPath, issuesPath, mrPath, searchContext }) => ({
+  searchPath,
   issuesPath,
   mrPath,
   searchContext,
+  search: '',
 });
 export default createState;
diff --git a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
index ec7d466336e..05be427742c 100644
--- a/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
+++ b/app/assets/javascripts/invite_members/components/invite_members_trigger.vue
@@ -65,7 +65,7 @@ export default {
       if (this.event && this.label) {
         return {
           ...baseAttributes,
-          'data-track-event': this.event,
+          'data-track-action': this.event,
           'data-track-label': this.label,
         };
       }
diff --git a/app/assets/javascripts/issuable/components/csv_export_modal.vue b/app/assets/javascripts/issuable/components/csv_export_modal.vue
index a374bba1926..1c88f8dfdca 100644
--- a/app/assets/javascripts/issuable/components/csv_export_modal.vue
+++ b/app/assets/javascripts/issuable/components/csv_export_modal.vue
@@ -89,7 +89,7 @@ export default {
         :href="exportCsvPath"
         data-method="post"
         :data-qa-selector="`export_${issuableType}_button`"
-        data-track-event="click_button"
+        data-track-action="click_button"
         :data-track-label="`export_${issuableType}_csv`"
       >
         <gl-sprintf :message="__('Export %{name}')">
diff --git a/app/assets/javascripts/notes/components/comment_type_dropdown.vue b/app/assets/javascripts/notes/components/comment_type_dropdown.vue
index 9c4bab2099c..663a912999d 100644
--- a/app/assets/javascripts/notes/components/comment_type_dropdown.vue
+++ b/app/assets/javascripts/notes/components/comment_type_dropdown.vue
@@ -93,7 +93,7 @@ export default {
     data-testid="comment-button"
     data-qa-selector="comment_button"
     :data-track-label="trackingLabel"
-    data-track-event="click_button"
+    data-track-action="click_button"
     @click="$emit('click')"
   >
     <gl-dropdown-item is-check-item :is-checked="isNoteTypeComment" @click="setNoteTypeToComment">
diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index d41c0a770d7..831e6dd8f92 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -89,7 +89,7 @@ export default {
         :title="__('Jump to next unresolved thread')"
         :aria-label="__('Jump to next unresolved thread')"
         class="discussion-next-btn"
-        data-track-event="click_button"
+        data-track-action="click_button"
         data-track-label="mr_next_unresolved_thread"
         data-track-property="click_next_unresolved_thread_top"
         icon="comment-next"
diff --git a/app/assets/javascripts/notes/components/note_actions/reply_button.vue b/app/assets/javascripts/notes/components/note_actions/reply_button.vue
index 0cd2afcf8a0..8c8cc7984b1 100644
--- a/app/assets/javascripts/notes/components/note_actions/reply_button.vue
+++ b/app/assets/javascripts/notes/components/note_actions/reply_button.vue
@@ -19,7 +19,7 @@ export default {
 <template>
   <gl-button
     v-gl-tooltip
-    data-track-event="click_button"
+    data-track-action="click_button"
     data-track-label="reply_comment_button"
     category="tertiary"
     icon="comment"
diff --git a/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue b/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue
index d17c37e9e1a..99461475af0 100644
--- a/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue
+++ b/app/assets/javascripts/pages/dashboard/projects/index/components/customize_homepage_banner.vue
@@ -77,7 +77,7 @@ export default {
       );
 
       if (button) {
-        button.setAttribute('data-track-event', 'click_go_to_preferences');
+        button.setAttribute('data-track-action', 'click_go_to_preferences');
         button.setAttribute('data-track-label', this.trackLabel);
       }
     },
diff --git a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
index 5f70a9b9664..fe2d376f1da 100644
--- a/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
+++ b/app/assets/javascripts/projects/settings_service_desk/components/service_desk_setting.vue
@@ -175,7 +175,7 @@ export default {
           <gl-sprintf
             :message="
               __(
-                'Please set up a Service Desk email address in order to add a custom suffix. %{linkStart}Learn more%{linkEnd}.',
+                'To add a custom suffix, set up a Service Desk email address. %{linkStart}Learn more.%{linkEnd}',
               )
             "
           >
diff --git a/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue b/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue
index d9c5edc91f1..f98aa0dc77d 100644
--- a/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue
+++ b/app/assets/javascripts/sidebar/components/assignees/assignee_title.vue
@@ -53,7 +53,7 @@ export default {
       class="js-sidebar-dropdown-toggle edit-link btn gl-text-gray-900! gl-ml-auto hide-collapsed btn-default btn-sm gl-button btn-default-tertiary float-right"
       href="#"
       data-test-id="edit-link"
-      data-track-event="click_edit_button"
+      data-track-action="click_edit_button"
       data-track-label="right_sidebar"
       data-track-property="assignee"
     >
diff --git a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue
index 19543d0927a..cb49f329f7e 100644
--- a/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue
+++ b/app/assets/javascripts/sidebar/components/lock/issuable_lock_form.vue
@@ -93,7 +93,7 @@ export default {
         class="float-right lock-edit btn gl-text-gray-900! gl-ml-auto hide-collapsed btn-default btn-sm gl-button btn-default-tertiary gl-mr-n2"
         href="#"
         data-testid="edit-link"
-        data-track-event="click_edit_button"
+        data-track-action="click_edit_button"
         data-track-label="right_sidebar"
         data-track-property="lock_issue"
         @click.prevent="toggleForm"
diff --git a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue
index 1243603805a..367dcdb961b 100644
--- a/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue
+++ b/app/assets/javascripts/sidebar/components/reviewers/reviewer_title.vue
@@ -40,7 +40,7 @@ export default {
       v-if="editable"
       class="js-sidebar-dropdown-toggle edit-link btn gl-text-gray-900! gl-ml-auto hide-collapsed btn-default btn-sm gl-button btn-default-tertiary float-right"
       href="#"
-      data-track-event="click_edit_button"
+      data-track-action="click_edit_button"
       data-track-label="right_sidebar"
       data-track-property="reviewer"
     >
diff --git a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
index 89aa03fd954..22adbd79ef6 100644
--- a/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
+++ b/app/assets/javascripts/sidebar/components/sidebar_editable_item.vue
@@ -136,7 +136,7 @@ export default {
         size="small"
         class="gl-text-gray-900! gl-ml-auto hide-collapsed gl-mr-n2"
         data-testid="edit-button"
-        :data-track-event="tracking.event"
+        :data-track-action="tracking.event"
         :data-track-label="tracking.label"
         :data-track-property="tracking.property"
         data-qa-selector="edit_link"
diff --git a/app/assets/javascripts/sidebar/track_invite_members.js b/app/assets/javascripts/sidebar/track_invite_members.js
index eab15578f0f..45a3366197b 100644
--- a/app/assets/javascripts/sidebar/track_invite_members.js
+++ b/app/assets/javascripts/sidebar/track_invite_members.js
@@ -2,10 +2,12 @@ import $ from 'jquery';
 import Tracking from '~/tracking';
 
 export default function initTrackInviteMembers(userDropdown) {
-  const { trackEvent, trackLabel } = userDropdown.querySelector('.js-invite-members-track').dataset;
+  const { trackAction, trackLabel } = userDropdown.querySelector(
+    '.js-invite-members-track',
+  ).dataset;
 
   $(userDropdown).on('shown.bs.dropdown', () => {
-    Tracking.event(undefined, trackEvent, {
+    Tracking.event(undefined, trackAction, {
       label: trackLabel,
     });
   });
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue
index d2581f57837..f3673005c45 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/mr_widget_suggest_pipeline.vue
@@ -98,7 +98,7 @@ export default {
               data-testid="add-pipeline-link"
               :data-track-property="humanAccess"
               :data-track-value="$options.SP_LINK_TRACK_VALUE"
-              :data-track-event="$options.SP_LINK_TRACK_EVENT"
+              :data-track-action="$options.SP_LINK_TRACK_EVENT"
               :data-track-label="$options.SP_TRACK_LABEL"
             >
               {{ content }}
@@ -139,7 +139,7 @@ export default {
             :href="pipelinePath"
             :data-track-property="humanAccess"
             :data-track-value="$options.SP_SHOW_TRACK_VALUE"
-            :data-track-event="$options.SP_SHOW_TRACK_EVENT"
+            :data-track-action="$options.SP_SHOW_TRACK_EVENT"
             :data-track-label="$options.SP_TRACK_LABEL"
           >
             {{ __('Show me how to add a pipeline') }}
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue
index ebd2b5cd22d..e31e69d0f3a 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/review_app_link.vue
@@ -39,7 +39,7 @@ export default {
     target="_blank"
     rel="noopener noreferrer nofollow"
     :class="cssClass"
-    data-track-event="open_review_app"
+    data-track-action="open_review_app"
     data-track-label="review_app"
   >
     {{ display.text }} <gl-icon class="fgray" name="external-link" />
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
new file mode 100644
index 00000000000..503ddf8a396
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/merge_checks_failed.vue
@@ -0,0 +1,75 @@
+<script>
+import { GlButton } from '@gitlab/ui';
+import { s__ } from '~/locale';
+import notesEventHub from '~/notes/event_hub';
+import StatusIcon from '../mr_widget_status_icon.vue';
+
+export default {
+  i18n: {
+    pipelineFailed: s__(
+      'mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure.',
+    ),
+    approvalNeeded: s__('mrWidget|You can only merge once this merge request is approved.'),
+    unresolvedDiscussions: s__('mrWidget|Merge blocked: all threads must be resolved.'),
+  },
+  components: {
+    StatusIcon,
+    GlButton,
+  },
+  props: {
+    mr: {
+      type: Object,
+      required: true,
+    },
+  },
+  computed: {
+    failedText() {
+      if (this.mr.isPipelineFailed) {
+        return this.$options.i18n.pipelineFailed;
+      } else if (this.mr.approvals && !this.mr.isApproved) {
+        return this.$options.i18n.approvalNeeded;
+      } else if (this.mr.hasMergeableDiscussionsState) {
+        return this.$options.i18n.unresolvedDiscussions;
+      }
+
+      return null;
+    },
+  },
+  methods: {
+    jumpToFirstUnresolvedDiscussion() {
+      notesEventHub.$emit('jumpToFirstUnresolvedDiscussion');
+    },
+  },
+};
+</script>
+
+<template>
+  <div class="mr-widget-body media gl-flex-wrap">
+    <status-icon status="warning" />
+    <p class="media-body gl-m-0! gl-font-weight-bold gl-text-black-normal!">
+      {{ failedText }}
+      <template v-if="failedText == $options.i18n.unresolvedDiscussions">
+        <gl-button
+          class="gl-ml-3"
+          size="small"
+          variant="confirm"
+          data-testid="jumpToUnresolved"
+          @click="jumpToFirstUnresolvedDiscussion"
+        >
+          {{ s__('mrWidget|Jump to first unresolved thread') }}
+        </gl-button>
+        <gl-button
+          v-if="mr.createIssueToResolveDiscussionsPath"
+          :href="mr.createIssueToResolveDiscussionsPath"
+          class="gl-ml-3"
+          size="small"
+          variant="confirm"
+          category="secondary"
+          data-testid="resolveIssue"
+        >
+          {{ s__('mrWidget|Create issue to resolve all threads') }}
+        </gl-button>
+      </template>
+    </p>
+  </div>
+</template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/terraform/terraform_plan.vue b/app/assets/javascripts/vue_merge_request_widget/components/terraform/terraform_plan.vue
index 427ab0842ea..87a310efe78 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/terraform/terraform_plan.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/terraform/terraform_plan.vue
@@ -104,7 +104,7 @@ export default {
           :href="plan.job_path"
           target="_blank"
           data-testid="terraform-report-link"
-          data-track-event="click_terraform_mr_plan_button"
+          data-track-action="click_terraform_mr_plan_button"
           data-track-label="mr_widget_terraform_mr_plan_button"
           data-track-property="terraform_mr_plan_button"
           class="btn btn-sm"
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 f8e6dcf7ec0..78aa3941bfe 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
@@ -89,6 +89,7 @@ export default {
       import('../reports/accessibility_report/grouped_accessibility_reports_app.vue'),
     MrWidgetApprovals,
     SecurityReportsApp: () => import('~/vue_shared/security_reports/security_reports_app.vue'),
+    MergeChecksFailed: () => import('./components/states/merge_checks_failed.vue'),
   },
   apollo: {
     state: {
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 afd5f766095..65d78fc283c 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
@@ -1,7 +1,9 @@
 import { stateKey } from './state_maps';
 
 export default function deviseState() {
-  if (this.projectArchived) {
+  if (this.hasMergeChecksFailed) {
+    return stateKey.mergeChecksFailed;
+  } else if (this.projectArchived) {
     return stateKey.archived;
   } else if (this.branchMissing) {
     return stateKey.missingBranch;
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
index 8979fe621ac..29e0c867f6b 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/mr_widget_store.js
@@ -347,4 +347,13 @@ export default class MergeRequestStore {
     this.approvals = data;
     this.isApproved = data.approved || false;
   }
+
+  get hasMergeChecksFailed() {
+    if (!window.gon?.features?.restructuredMrWidget) return false;
+
+    return (
+      this.hasMergeableDiscussionsState ||
+      (this.onlyAllowMergeIfPipelineSucceeds && this.isPipelineFailed)
+    );
+  }
 }
diff --git a/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js b/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js
index 28507bba3e5..04454882666 100644
--- a/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js
+++ b/app/assets/javascripts/vue_merge_request_widget/stores/state_maps.js
@@ -18,6 +18,7 @@ const stateToComponentMap = {
   autoMergeFailed: 'mr-widget-auto-merge-failed',
   shaMismatch: 'sha-mismatch',
   rebase: 'mr-widget-rebase',
+  mergeChecksFailed: 'mergeChecksFailed',
 };
 
 const statesToShowHelpWidget = [
@@ -50,6 +51,7 @@ export const stateKey = {
   readyToMerge: 'readyToMerge',
   rebase: 'rebase',
   merged: 'merged',
+  mergeChecksFailed: 'mergeChecksFailed',
 };
 
 export default {
diff --git a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
index 7112295fa57..912aa8ce294 100644
--- a/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
+++ b/app/assets/javascripts/vue_shared/components/markdown/toolbar.vue
@@ -75,7 +75,7 @@ export default {
         variant="link"
         :track-experiment="$options.inviteMembersInComment"
         :trigger-source="$options.inviteMembersInComment"
-        data-track-event="comment_invite_click"
+        data-track-action="comment_invite_click"
       />
       <span class="uploading-progress-container hide">
         <gl-icon name="media" />
diff --git a/app/assets/javascripts/whats_new/components/feature.vue b/app/assets/javascripts/whats_new/components/feature.vue
index 11096b08032..a93bda326de 100644
--- a/app/assets/javascripts/whats_new/components/feature.vue
+++ b/app/assets/javascripts/whats_new/components/feature.vue
@@ -40,7 +40,7 @@ export default {
       :href="feature.url"
       target="_blank"
       class="gl-display-block"
-      data-track-event="click_whats_new_item"
+      data-track-action="click_whats_new_item"
       :data-track-label="feature.title"
       :data-track-property="feature.url"
     >
@@ -55,7 +55,7 @@ export default {
       :href="feature.url"
       target="_blank"
       class="whats-new-item-title-link gl-display-block gl-mt-4 gl-mb-1"
-      data-track-event="click_whats_new_item"
+      data-track-action="click_whats_new_item"
       :data-track-label="feature.title"
       :data-track-property="feature.url"
     >
@@ -79,7 +79,7 @@ export default {
     <gl-button
       :href="feature.url"
       target="_blank"
-      data-track-event="click_whats_new_item"
+      data-track-action="click_whats_new_item"
       :data-track-label="feature.title"
       :data-track-property="feature.url"
     >
diff --git a/app/controllers/explore/projects_controller.rb b/app/controllers/explore/projects_controller.rb
index e0973b0f3b4..6e9e9e07e37 100644
--- a/app/controllers/explore/projects_controller.rb
+++ b/app/controllers/explore/projects_controller.rb
@@ -26,6 +26,7 @@ class Explore::ProjectsController < Explore::ApplicationController
   feature_category :projects
 
   def index
+    show_alert_if_search_is_disabled
     @projects = load_projects
 
     respond_to do |format|
@@ -120,6 +121,12 @@ class Explore::ProjectsController < Explore::ApplicationController
       end
     end
   end
+
+  def show_alert_if_search_is_disabled
+    return if current_user || params[:name].blank? && params[:search].blank? || !html_request? || Feature.disabled?(:disable_anonymous_search, type: :ops)
+
+    flash[:notice] = _('You must sign in to search for specific projects.')
+  end
 end
 
 Explore::ProjectsController.prepend_mod_with('Explore::ProjectsController')
diff --git a/app/finders/projects_finder.rb b/app/finders/projects_finder.rb
index 6bb1df9ee8e..92d0e7b2b57 100644
--- a/app/finders/projects_finder.rb
+++ b/app/finders/projects_finder.rb
@@ -193,6 +193,7 @@ class ProjectsFinder < UnionFinder
   def by_search(items)
     params[:search] ||= params[:name]
 
+    return items if Feature.enabled?(:disable_anonymous_search, type: :ops) && current_user.nil?
     return items.none if params[:search].present? && params[:minimum_search_length].present? && params[:search].length < params[:minimum_search_length].to_i
 
     items.optionally_search(params[:search], include_namespace: params[:search_namespaces].present?)
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 45f4c968061..f3cc46216e5 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -373,7 +373,7 @@ module IssuablesHelper
       is_collapsed: is_collapsed,
       track_label: "right_sidebar",
       track_property: "update_todo",
-      track_event: "click_button",
+      track_action: "click_button",
       track_value: ""
     }
   end
diff --git a/app/helpers/nav/new_dropdown_helper.rb b/app/helpers/nav/new_dropdown_helper.rb
index 0384f82f1f1..e7d69c38a54 100644
--- a/app/helpers/nav/new_dropdown_helper.rb
+++ b/app/helpers/nav/new_dropdown_helper.rb
@@ -32,7 +32,7 @@ module Nav
             id: 'new_project',
             title: _('New project/repository'),
             href: new_project_path(namespace_id: group.id),
-            data: { track_event: 'click_link_new_project_group', track_label: 'plus_menu_dropdown' }
+            data: { track_action: 'click_link_new_project_group', track_label: 'plus_menu_dropdown' }
           )
         )
       end
@@ -43,7 +43,7 @@ module Nav
             id: 'new_subgroup',
             title: _('New subgroup'),
             href: new_group_path(parent_id: group.id),
-            data: { track_event: 'click_link_new_subgroup', track_label: 'plus_menu_dropdown' }
+            data: { track_action: 'click_link_new_subgroup', track_label: 'plus_menu_dropdown' }
           )
         )
       end
@@ -74,7 +74,7 @@ module Nav
             id: 'new_issue',
             title: _('New issue'),
             href: new_project_issue_path(project),
-            data: { track_event: 'click_link_new_issue', track_label: 'plus_menu_dropdown', qa_selector: 'new_issue_link' }
+            data: { track_action: 'click_link_new_issue', track_label: 'plus_menu_dropdown', qa_selector: 'new_issue_link' }
           )
         )
       end
@@ -85,7 +85,7 @@ module Nav
             id: 'new_mr',
             title: _('New merge request'),
             href: project_new_merge_request_path(merge_project),
-            data: { track_event: 'click_link_new_mr', track_label: 'plus_menu_dropdown' }
+            data: { track_action: 'click_link_new_mr', track_label: 'plus_menu_dropdown' }
           )
         )
       end
@@ -96,7 +96,7 @@ module Nav
             id: 'new_snippet',
             title: _('New snippet'),
             href: new_project_snippet_path(project),
-            data: { track_event: 'click_link_new_snippet_project', track_label: 'plus_menu_dropdown' }
+            data: { track_action: 'click_link_new_snippet_project', track_label: 'plus_menu_dropdown' }
           )
         )
       end
@@ -124,7 +124,7 @@ module Nav
             id: 'general_new_project',
             title: _('New project/repository'),
             href: new_project_path,
-            data: { track_event: 'click_link_new_project', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_project_link' }
+            data: { track_action: 'click_link_new_project', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_project_link' }
           )
         )
       end
@@ -135,7 +135,7 @@ module Nav
             id: 'general_new_group',
             title: _('New group'),
             href: new_group_path,
-            data: { track_event: 'click_link_new_group', track_label: 'plus_menu_dropdown' }
+            data: { track_action: 'click_link_new_group', track_label: 'plus_menu_dropdown' }
           )
         )
       end
@@ -146,7 +146,7 @@ module Nav
             id: 'general_new_snippet',
             title: _('New snippet'),
             href: new_snippet_path,
-            data: { track_event: 'click_link_new_snippet_parent', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_snippet_link' }
+            data: { track_action: 'click_link_new_snippet_parent', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_snippet_link' }
           )
         )
       end
@@ -164,7 +164,7 @@ module Nav
         emoji: ('shaking_hands' if experiment_enabled?(:invite_members_new_dropdown)),
         href: href,
         data: {
-          track_event: 'click_link',
+          track_action: 'click_link',
           track_label: tracking_label,
           track_property: experiment_tracking_category_and_group(:invite_members_new_dropdown)
         }
diff --git a/app/helpers/nav/top_nav_helper.rb b/app/helpers/nav/top_nav_helper.rb
index 052b8339ebd..3055ad57b80 100644
--- a/app/helpers/nav/top_nav_helper.rb
+++ b/app/helpers/nav/top_nav_helper.rb
@@ -98,7 +98,7 @@ module Nav
         builder.add_primary_menu_item_with_shortcut(
           active: nav == 'project' || active_nav_link?(path: %w[root#index projects#trending projects#starred dashboard/projects#index]),
           css_class: 'qa-projects-dropdown',
-          data: { track_label: "projects_dropdown", track_event: "click_dropdown" },
+          data: { track_label: "projects_dropdown", track_action: "click_dropdown" },
           view: PROJECTS_VIEW,
           shortcut_href: dashboard_projects_path,
           **projects_menu_item_attrs
@@ -112,7 +112,7 @@ module Nav
         builder.add_primary_menu_item_with_shortcut(
           active: nav == 'group' || active_nav_link?(path: %w[dashboard/groups explore/groups]),
           css_class: 'qa-groups-dropdown',
-          data: { track_label: "groups_dropdown", track_event: "click_dropdown" },
+          data: { track_label: "groups_dropdown", track_action: "click_dropdown" },
           view: GROUPS_VIEW,
           shortcut_href: dashboard_groups_path,
           **groups_menu_item_attrs
diff --git a/app/models/member.rb b/app/models/member.rb
index 28b8695f70b..beb4c05f2a6 100644
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -147,7 +147,6 @@ class Member < ApplicationRecord
   scope :owners, -> { active.where(access_level: OWNER) }
   scope :owners_and_maintainers, -> { active.where(access_level: [OWNER, MAINTAINER]) }
   scope :with_user, -> (user) { where(user: user) }
-  scope :with_user_by_email, -> (email) { left_join_users.where(users: { email: email } ) }
 
   scope :preload_user_and_notification_settings, -> { preload(user: :notification_settings) }
 
diff --git a/app/views/devise/shared/_tabs_normal.html.haml b/app/views/devise/shared/_tabs_normal.html.haml
index a2d5a8be625..01dd3748887 100644
--- a/app/views/devise/shared/_tabs_normal.html.haml
+++ b/app/views/devise/shared/_tabs_normal.html.haml
@@ -6,4 +6,4 @@
     %a.nav-link.active{ href: '#login-pane', data: { toggle: 'tab', qa_selector: 'sign_in_tab' }, role: 'tab' }= tab_title
   - if render_signup_link && allow_signup?
     %li.nav-item{ role: 'presentation' }
-      %a.nav-link{ href: '#register-pane', data: { track_label: 'sign_in_register', track_property: '', track_event: 'click_button', track_value: '', toggle: 'tab', qa_selector: 'register_tab' }, role: 'tab' } Register
+      %a.nav-link{ href: '#register-pane', data: { track_label: 'sign_in_register', track_property: '', track_action: 'click_button', track_value: '', toggle: 'tab', qa_selector: 'register_tab' }, role: 'tab' } Register
diff --git a/app/views/layouts/_search.html.haml b/app/views/layouts/_search.html.haml
index 5ce275d4a43..2d186dfbd91 100644
--- a/app/views/layouts/_search.html.haml
+++ b/app/views/layouts/_search.html.haml
@@ -1,4 +1,4 @@
-.search.search-form{ data: { track_label: "navbar_search", track_event: "activate_form_input", track_value: "" } }
+.search.search-form{ data: { track_label: "navbar_search", track_action: "activate_form_input", track_value: "" } }
   = form_tag search_path, method: :get, class: 'form-inline form-control' do |_f|
     .search-input-container
       .search-input-wrap
diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml
index 1dbd1049fce..3e7155b2c0e 100644
--- a/app/views/layouts/header/_default.html.haml
+++ b/app/views/layouts/header/_default.html.haml
@@ -32,6 +32,7 @@
               - unless current_controller?(:search)
                 - if Feature.enabled?(:new_header_search)
                   #js-header-search.header-search{ data: { 'search-context' => search_context.to_json,
+                  'search-path' => search_path,
                   'issues-path' => issues_dashboard_path,
                   'mr-path' => merge_requests_dashboard_path } }
                     %input{ type: "text", placeholder: _('Search or jump to...'), class: 'form-control gl-form-input' }
@@ -45,7 +46,7 @@
               = link_to assigned_issues_dashboard_path, title: _('Issues'), class: 'dashboard-shortcuts-issues', aria: { label: _('Issues') },
                 data: { qa_selector: 'issues_shortcut_button', toggle: 'tooltip', placement: 'bottom',
                 track_label: 'main_navigation',
-                track_event: 'click_issues_link',
+                track_action: 'click_issues_link',
                 track_property: 'navigation',
                 container: 'body' } do
                 = sprite_icon('issues')
@@ -59,7 +60,7 @@
                 toggle: "dropdown",
                 placement: 'bottom',
                 track_label: 'main_navigation',
-                track_event: 'click_merge_link',
+                track_action: 'click_merge_link',
                 track_property: 'navigation',
                 container: 'body' } do
                 = sprite_icon('git-merge')
@@ -85,7 +86,7 @@
               = link_to dashboard_todos_path, title: _('To-Do List'), aria: { label: _('To-Do List') }, class: 'shortcuts-todos',
                 data: { qa_selector: 'todos_shortcut_button', toggle: 'tooltip', placement: 'bottom',
                 track_label: 'main_navigation',
-                track_event: 'click_to_do_link',
+                track_action: 'click_to_do_link',
                 track_property: 'navigation',
                 container: 'body' } do
                 = sprite_icon('todo-done')
@@ -101,7 +102,7 @@
             .dropdown-menu.dropdown-menu-right
               = render 'layouts/header/help_dropdown'
           - if header_link?(:user_dropdown)
-            %li.nav-item.header-user.js-nav-user-dropdown.dropdown{ data: { track_label: "profile_dropdown", track_event: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) }
+            %li.nav-item.header-user.js-nav-user-dropdown.dropdown{ data: { track_label: "profile_dropdown", track_action: "click_dropdown", track_value: "", qa_selector: 'user_menu' }, class: ('mr-0' if has_impersonation_link) }
               = link_to current_user, class: user_dropdown_class, data: { toggle: "dropdown" } do
                 = image_tag avatar_icon_for_user(current_user, 23), width: 23, height: 23, class: "header-user-avatar qa-user-avatar", alt: current_user.name
                 = render_if_exists 'layouts/header/user_notification_dot', project: project, namespace: group
diff --git a/app/views/layouts/header/_new_dropdown.html.haml b/app/views/layouts/header/_new_dropdown.html.haml
index 0be87ad963c..a0b271fdafa 100644
--- a/app/views/layouts/header/_new_dropdown.html.haml
+++ b/app/views/layouts/header/_new_dropdown.html.haml
@@ -6,7 +6,7 @@
 
 - return if menu_sections.empty?
 
-%li.header-new.dropdown{ class: top_class, data: { track_label: "new_dropdown", track_event: "click_dropdown" } }
+%li.header-new.dropdown{ class: top_class, data: { track_label: "new_dropdown", track_action: "click_dropdown" } }
   = link_to new_project_path, class: "header-new-dropdown-toggle has-tooltip", id: "js-onboarding-new-project-link", title: title, ref: 'tooltip', aria: { label: title }, data: { toggle: 'dropdown', placement: 'bottom', container: 'body', display: 'static', qa_selector: 'new_menu_toggle' } do
     = sprite_icon('plus-square')
     = sprite_icon('chevron-down', css_class: 'caret-down')
diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml
index 2055f1c7f60..815a3cf6966 100644
--- a/app/views/projects/_import_project_pane.html.haml
+++ b/app/views/projects/_import_project_pane.html.haml
@@ -76,7 +76,7 @@
 
       - if phabricator_import_enabled?
         %div
-          = link_to new_import_phabricator_path, class: 'gl-button btn-default btn import_phabricator', data: { track_label: "#{track_label}", track_event: "click_button", track_property: "phabricator" } do
+          = link_to new_import_phabricator_path, class: 'gl-button btn-default btn import_phabricator', data: { track_label: "#{track_label}", track_action: "click_button", track_property: "phabricator" } do
             .gl-button-icon
               = custom_icon('issues')
             = _("Phabricator Tasks")
diff --git a/app/views/projects/_invite_members_empty_project.html.haml b/app/views/projects/_invite_members_empty_project.html.haml
index ee2215b0fbb..5bc53339bf0 100644
--- a/app/views/projects/_invite_members_empty_project.html.haml
+++ b/app/views/projects/_invite_members_empty_project.html.haml
@@ -1,6 +1,6 @@
 %h4.gl-mt-0.gl-mb-3{ data: { testid: 'invite-member-section',
   track_label: 'invite_members_empty_project',
-  track_event: 'render' } }
+  track_action: 'render' } }
   = s_('InviteMember|Invite your team')
 %p= s_('InviteMember|Add members to this project and start collaborating with your team.')
 .js-invite-members-trigger{ data: { variant: 'confirm',
diff --git a/app/views/projects/_new_project_fields.html.haml b/app/views/projects/_new_project_fields.html.haml
index 0dc71ecb50e..fb7a7ef8985 100644
--- a/app/views/projects/_new_project_fields.html.haml
+++ b/app/views/projects/_new_project_fields.html.haml
@@ -8,7 +8,7 @@
   .form-group.project-name.col-sm-12
     = f.label :name, class: 'label-bold' do
       %span= _("Project name")
-    = f.text_field :name, placeholder: "My awesome project", class: "form-control gl-form-input input-lg", data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_name", track_value: "" }, required: true, aria: { required: true }
+    = f.text_field :name, placeholder: "My awesome project", class: "form-control gl-form-input input-lg", data: { track_label: "#{track_label}", track_action: "activate_form_input", track_property: "project_name", track_value: "" }, required: true, aria: { required: true }
   .form-group.project-path.col-sm-6
     = f.label :namespace_id, class: 'label-bold' do
       %span= _('Project URL')
@@ -26,7 +26,7 @@
                                                                         display_path: true,
                                                                         extra_group: namespace_id),
                      {},
-                     { class: 'select2 js-select-namespace qa-project-namespace-select block-truncated', data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_path", track_value: "", qa_selector: "select_namespace_dropdown" }})
+                     { class: 'select2 js-select-namespace qa-project-namespace-select block-truncated', data: { track_label: "#{track_label}", track_action: "activate_form_input", track_property: "project_path", track_value: "", qa_selector: "select_namespace_dropdown" }})
       - else
         .input-group-prepend.static-namespace.flex-shrink-0.has-tooltip{ title: user_url(current_user.username) + '/' }
           .input-group-text.border-0
@@ -45,7 +45,7 @@
 .form-group
   = f.label :description, class: 'label-bold' do
     = s_('ProjectsNew|Project description %{tag_start}(optional)%{tag_end}').html_safe % { tag_start: '<span>'.html_safe, tag_end: '</span>'.html_safe }
-  = f.text_area :description, placeholder: s_('ProjectsNew|Description format'), class: "form-control gl-form-input", rows: 3, maxlength: 250, data: { track_label: "#{track_label}", track_event: "activate_form_input", track_property: "project_description", track_value: "" }
+  = f.text_area :description, placeholder: s_('ProjectsNew|Description format'), class: "form-control gl-form-input", rows: 3, maxlength: 250, data: { track_label: "#{track_label}", track_action: "activate_form_input", track_property: "project_description", track_value: "" }
 
 = f.label :visibility_level, class: 'label-bold' do
   = s_('ProjectsNew|Visibility Level')
@@ -56,12 +56,12 @@
   .form-group.row.initialize-with-readme-setting
     %div{ :class => "col-sm-12" }
       .form-check
-        = check_box_tag 'project[initialize_with_readme]', '1', true, class: 'form-check-input', data: { qa_selector: "initialize_with_readme_checkbox", track_label: "#{track_label}", track_event: "activate_form_input", track_property: "init_with_readme", track_value: "" }
+        = check_box_tag 'project[initialize_with_readme]', '1', true, class: 'form-check-input', data: { qa_selector: "initialize_with_readme_checkbox", track_label: "#{track_label}", track_action: "activate_form_input", track_property: "init_with_readme", track_value: "" }
         = label_tag 'project[initialize_with_readme]', class: 'form-check-label' do
           .option-title
             %strong= s_('ProjectsNew|Initialize repository with a README')
           .option-description
             = s_('ProjectsNew|Allows you to immediately clone this project’s repository. Skip this if you plan to push up an existing repository.')
 
-= f.submit _('Create project'), class: "btn gl-button btn-confirm", data: { track_label: "#{track_label}", track_event: "click_button", track_property: "create_project", track_value: "" }
-= link_to _('Cancel'), dashboard_projects_path, class: 'btn gl-button btn-default btn-cancel', data: { track_label: "#{track_label}", track_event: "click_button", track_property: "cancel", track_value: "" }
+= f.submit _('Create project'), class: "btn gl-button btn-confirm", data: { track_label: "#{track_label}", track_action: "click_button", track_property: "create_project", track_value: "" }
+= link_to _('Cancel'), dashboard_projects_path, class: 'btn gl-button btn-default btn-cancel', data: { track_label: "#{track_label}", track_action: "click_button", track_property: "cancel", track_value: "" }
diff --git a/app/views/projects/project_templates/_template.html.haml b/app/views/projects/project_templates/_template.html.haml
index 827ff62f8c3..5e4b1397dd3 100644
--- a/app/views/projects/project_templates/_template.html.haml
+++ b/app/views/projects/project_templates/_template.html.haml
@@ -8,9 +8,9 @@
     .text-muted
       = template.description
   .controls.d-flex.align-items-center
-    %a.btn.gl-button.btn-default.gl-mr-3{ href: template.preview, rel: 'noopener noreferrer', target: '_blank', data: { track_label: "template_preview", track_property: template.name, track_event: "click_button", track_value: "" } }
+    %a.btn.gl-button.btn-default.gl-mr-3{ href: template.preview, rel: 'noopener noreferrer', target: '_blank', data: { track_label: "template_preview", track_property: template.name, track_action: "click_button", track_value: "" } }
       = _("Preview")
     %label.btn.gl-button.btn-confirm.template-button.choose-template.gl-mb-0{ for: template.name }
-      %input{ type: "radio", autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name, data: { track_label: "template_use", track_property: template.name, track_event: "click_button", track_value: "" } }
+      %input{ type: "radio", autocomplete: "off", name: "project[template_name]", id: template.name, value: template.name, data: { track_label: "template_use", track_property: template.name, track_action: "click_button", track_value: "" } }
       %span{ data: { qa_selector: 'use_template_button' } }
         = _("Use template")
diff --git a/app/views/search/results/_blob_data.html.haml b/app/views/search/results/_blob_data.html.haml
index dcbf2c02307..88a2ab4bb42 100644
--- a/app/views/search/results/_blob_data.html.haml
+++ b/app/views/search/results/_blob_data.html.haml
@@ -1,7 +1,7 @@
 .js-blob-result.gl-mt-3.gl-mb-5{ data: { qa_selector: 'result_item_content' } }
   .file-holder.file-holder-top-border
     .js-file-title.file-title{ data: { qa_selector: 'file_title_content' } }
-      = link_to blob_link, data: {track_event: 'click_text', track_label: 'blob_path', track_property: 'search_result'} do
+      = link_to blob_link, data: {track_action: 'click_text', track_label: 'blob_path', track_property: 'search_result'} do
         = sprite_icon('document')
         %strong
           = search_blob_title(project, path)
diff --git a/app/views/search/results/_commit.html.haml b/app/views/search/results/_commit.html.haml
index 3e5ea785aae..7aeeef5faed 100644
--- a/app/views/search/results/_commit.html.haml
+++ b/app/views/search/results/_commit.html.haml
@@ -1 +1 @@
-= render 'projects/commits/commit', project: commit.project, commit: commit, ref: nil, show_project_name: @project.nil?, link_data_attrs: {track_event: 'click_text', track_label: 'commit_title', track_property: 'search_result'}
+= render 'projects/commits/commit', project: commit.project, commit: commit, ref: nil, show_project_name: @project.nil?, link_data_attrs: {track_action: 'click_text', track_label: 'commit_title', track_property: 'search_result'}
diff --git a/app/views/search/results/_issuable.html.haml b/app/views/search/results/_issuable.html.haml
index 63524bbf00e..5645fbfb238 100644
--- a/app/views/search/results/_issuable.html.haml
+++ b/app/views/search/results/_issuable.html.haml
@@ -3,7 +3,7 @@
     %span.gl-display-flex.gl-align-items-center
       %span.badge.badge-pill.gl-badge.sm{ class: "badge-#{issuable_state_to_badge_class(issuable)}" }= issuable_state_text(issuable)
       = sprite_icon('eye-slash', css_class: 'gl-text-gray-500 gl-ml-2') if issuable.respond_to?(:confidential?) && issuable.confidential?
-      = link_to issuable_path(issuable), data: { track_event: 'click_text', track_label: "#{issuable.class.name.downcase}_title", track_property: 'search_result' }, class: 'gl-w-full' do
+      = link_to issuable_path(issuable), data: { track_action: 'click_text', track_label: "#{issuable.class.name.downcase}_title", track_property: 'search_result' }, class: 'gl-w-full' do
         %span.term.str-truncated.gl-font-weight-bold.gl-ml-2= issuable.title
     .gl-text-gray-500.gl-my-3
       = issuable_project_reference(issuable)
diff --git a/app/views/search/results/_milestone.html.haml b/app/views/search/results/_milestone.html.haml
index 6d4ce88a377..a57c94c19c9 100644
--- a/app/views/search/results/_milestone.html.haml
+++ b/app/views/search/results/_milestone.html.haml
@@ -1,6 +1,6 @@
 .search-result-row
   %h4
-    = link_to project_milestone_path(milestone.project, milestone), data: {track_event: 'click_text', track_label: 'milestone_title', track_property: 'search_result'} do
+    = link_to project_milestone_path(milestone.project, milestone), data: {track_action: 'click_text', track_label: 'milestone_title', track_property: 'search_result'} do
       %span.term.str-truncated= milestone.title
 
   - if milestone.description.present?
diff --git a/app/views/search/results/_note.html.haml b/app/views/search/results/_note.html.haml
index 8d5d8670b5c..67f16075649 100644
--- a/app/views/search/results/_note.html.haml
+++ b/app/views/search/results/_note.html.haml
@@ -18,7 +18,7 @@
     - else
       %span #{note.noteable_type.titleize} ##{noteable_identifier}
       &middot;
-      = link_to note.noteable.title, note_url, data: {track_event: 'click_text', track_label: 'noteable_title', track_property: 'search_result'}
+      = link_to note.noteable.title, note_url, data: {track_action: 'click_text', track_label: 'noteable_title', track_property: 'search_result'}
 
     %span.note-headline-light.note-headline-meta
       %span.system-note-separator
diff --git a/app/views/search/results/_wiki_blob.html.haml b/app/views/search/results/_wiki_blob.html.haml
index 55161ce333b..b59275c35df 100644
--- a/app/views/search/results/_wiki_blob.html.haml
+++ b/app/views/search/results/_wiki_blob.html.haml
@@ -3,7 +3,7 @@
 
 %div{ class: 'search-result-row gl-pb-3! gl-mt-5 gl-mb-0!' }
   %span.gl-display-flex.gl-align-items-center
-    = link_to wiki_blob_link, data: { track_event: 'click_text', track_label: "wiki_title", track_property: 'search_result' }, class: 'gl-w-full' do
+    = link_to wiki_blob_link, data: { track_action: 'click_text', track_label: "wiki_title", track_property: 'search_result' }, class: 'gl-w-full' do
       %span.term.str-truncated.gl-font-weight-bold= ::Gitlab::Git::Wiki::GollumSlug.canonicalize_filename(wiki_blob.path)
   .description.term.col-sm-10.gl-px-0
     = simple_search_highlight_and_truncate(wiki_blob.data, @search_term)
diff --git a/app/views/shared/_help_dropdown_forum_link.html.haml b/app/views/shared/_help_dropdown_forum_link.html.haml
index 351c875475a..f3c69a7c897 100644
--- a/app/views/shared/_help_dropdown_forum_link.html.haml
+++ b/app/views/shared/_help_dropdown_forum_link.html.haml
@@ -1,2 +1,2 @@
 = link_to _("Community forum"), "https://forum.gitlab.com/", target: '_blank', class: 'text-nowrap',
-  rel: 'noopener noreferrer', data: { 'track_event': 'click_forum', 'track_property': 'question_menu' }
+  rel: 'noopener noreferrer', data: { 'track_action': 'click_forum', 'track_property': 'question_menu' }
diff --git a/app/views/shared/_visibility_radios.html.haml b/app/views/shared/_visibility_radios.html.haml
index 90b12557bc8..f48bfcd0e72 100644
--- a/app/views/shared/_visibility_radios.html.haml
+++ b/app/views/shared/_visibility_radios.html.haml
@@ -3,7 +3,7 @@
 
 - available_visibility_levels.each do |level|
   .form-check
-    = form.radio_button model_method, level, checked: (selected_level == level), class: 'form-check-input', data: { track_label: "blank_project", track_event: "activate_form_input", track_property: "#{model_method}_#{level}", track_value: "", qa_selector: "#{visibility_level_label(level).downcase}_radio" }
+    = form.radio_button model_method, level, checked: (selected_level == level), class: 'form-check-input', data: { track_label: "blank_project", track_action: "activate_form_input", track_property: "#{model_method}_#{level}", track_value: "", qa_selector: "#{visibility_level_label(level).downcase}_radio" }
     = form.label "#{model_method}_#{level}", class: 'form-check-label' do
       = visibility_level_icon(level)
       .option-title
diff --git a/app/views/shared/access_tokens/_table.html.haml b/app/views/shared/access_tokens/_table.html.haml
index 33d6b9573d4..c096044e439 100644
--- a/app/views/shared/access_tokens/_table.html.haml
+++ b/app/views/shared/access_tokens/_table.html.haml
@@ -51,7 +51,7 @@
                     = _('Expired')
                 - else
                   %span{ class: ('text-warning' if token.expires_soon?) }
-                    = _('In %{time_to_now}') % { time_to_now: distance_of_time_in_words_to_now(token.expires_at) }
+                    = time_ago_with_tooltip(token.expires_at)
               - else
                 %span.token-never-expires-label= _('Never')
             - if project
diff --git a/app/views/shared/deploy_tokens/_table.html.haml b/app/views/shared/deploy_tokens/_table.html.haml
index fe32fcf94d0..db9c646b694 100644
--- a/app/views/shared/deploy_tokens/_table.html.haml
+++ b/app/views/shared/deploy_tokens/_table.html.haml
@@ -20,7 +20,7 @@
             %td
               - if token.expires?
                 %span{ class: ('text-warning' if token.expires_soon?) }
-                  In #{distance_of_time_in_words_to_now(token.expires_at)}
+                  = time_ago_with_tooltip(token.expires_at)
               - else
                 %span.token-never-expires-label= _('Never')
             %td= token.scopes.present? ? token.scopes.join(', ') : _('no scopes selected')
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index c76aa176696..1e8724c3448 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -88,7 +88,7 @@
             = custom_icon('icon_arrow_right')
           .dropdown.sidebar-move-issue-dropdown.hide-collapsed
             %button.gl-button.btn.btn-default.btn-block.js-sidebar-dropdown-toggle.js-move-issue{ type: 'button',
-              data: { toggle: 'dropdown', display: 'static', track_label: "right_sidebar", track_property: "move_issue", track_event: "click_button", track_value: "" } }
+              data: { toggle: 'dropdown', display: 'static', track_label: "right_sidebar", track_property: "move_issue", track_action: "click_button", track_value: "" } }
               = _('Move issue')
             .dropdown-menu.dropdown-menu-selectable.dropdown-extended-height
               = dropdown_title(_('Move issue'))
diff --git a/app/views/shared/issuable/_sidebar_user_dropdown.html.haml b/app/views/shared/issuable/_sidebar_user_dropdown.html.haml
index 84d2fc033c8..c058e7ebe3e 100644
--- a/app/views/shared/issuable/_sidebar_user_dropdown.html.haml
+++ b/app/views/shared/issuable/_sidebar_user_dropdown.html.haml
@@ -6,7 +6,7 @@
   - options[:footer_content] = true
   - options[:wrapper_class] = local_assigns.fetch(:wrapper_class)
   - options[:toggle_class] += ' js-invite-members-track'
-  - data['track-event'] = 'show_invite_members'
+  - data['track-action'] = 'show_invite_members'
   - data['track-label'] = local_assigns.fetch(:track_label)
 
   = dropdown_tag(data['dropdown-title'], options: options) do
diff --git a/app/views/shared/issuable/form/_type_selector.html.haml b/app/views/shared/issuable/form/_type_selector.html.haml
index 3b4ab22ce32..f5f6f32d5ba 100644
--- a/app/views/shared/issuable/form/_type_selector.html.haml
+++ b/app/views/shared/issuable/form/_type_selector.html.haml
@@ -21,7 +21,7 @@
                 %li.js-filter-issuable-type
                   = link_to new_project_issue_path(@project), class: ("is-active" if issuable.issue?) do
                     #{sprite_icon(work_item_type_icon(:issue), css_class: 'gl-icon')} #{_("Issue")}
-                %li.js-filter-issuable-type{ data: { track: { event: "select_issue_type_incident", label: "select_issue_type_incident_dropdown_option" } } }
+                %li.js-filter-issuable-type{ data: { track: { action: "select_issue_type_incident", label: "select_issue_type_incident_dropdown_option" } } }
                   = link_to new_project_issue_path(@project, { issuable_template: 'incident', issue: { issue_type: 'incident' } }), class: ("is-active" if issuable.incident?) do
                     #{sprite_icon(work_item_type_icon(:incident), css_class: 'gl-icon')} #{_("Incident")}
 
diff --git a/config/events/20210914201801_alert_integrations_view_alert_integrations_list.yml b/config/events/20210914201801_alert_integrations_view_alert_integrations_list.yml
new file mode 100644
index 00000000000..8d607711266
--- /dev/null
+++ b/config/events/20210914201801_alert_integrations_view_alert_integrations_list.yml
@@ -0,0 +1,21 @@
+description: "Show alert integrations list"
+category: "Alert Integrations"
+action: view_alert_integrations_list
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: monitor
+product_group: group::monitor
+product_category:
+milestone: "13.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44549
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_commit_ci_file_dismissed.yml b/config/events/20210914201801_code_quality_walkthrough_commit_ci_file_dismissed.yml
new file mode 100644
index 00000000000..82e0378c3c7
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_commit_ci_file_dismissed.yml
@@ -0,0 +1,21 @@
+description: "Commit CI file dismissed"
+category: "code_quality_walkthrough"
+action: commit_ci_file_dismissed
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_commit_ci_file_displayed.yml b/config/events/20210914201801_code_quality_walkthrough_commit_ci_file_displayed.yml
new file mode 100644
index 00000000000..d8ed607b700
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_commit_ci_file_displayed.yml
@@ -0,0 +1,21 @@
+description: "Commit CI file displayed"
+category: "code_quality_walkthrough"
+action: commit_ci_file_displayed
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_commit_created.yml b/config/events/20210914201801_code_quality_walkthrough_commit_created.yml
new file mode 100644
index 00000000000..8611cfebc4b
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_commit_created.yml
@@ -0,0 +1,21 @@
+description: "Commit created"
+category: "code_quality_walkthrough"
+action: commit_created
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_cta_clicked.yml b/config/events/20210914201801_code_quality_walkthrough_cta_clicked.yml
new file mode 100644
index 00000000000..84ed891ce36
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_cta_clicked.yml
@@ -0,0 +1,21 @@
+description: "Click empty state CTA"
+category: "code_quality_walkthrough"
+action: cta_clicked
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_failed_pipeline_displayed.yml b/config/events/20210914201801_code_quality_walkthrough_failed_pipeline_displayed.yml
new file mode 100644
index 00000000000..9a65e07c334
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_failed_pipeline_displayed.yml
@@ -0,0 +1,21 @@
+description: "Show failed pipeline"
+category: "code_quality_walkthrough"
+action: failed_pipeline_displayed
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_failed_pipeline_view_logs.yml b/config/events/20210914201801_code_quality_walkthrough_failed_pipeline_view_logs.yml
new file mode 100644
index 00000000000..d72a1b025f3
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_failed_pipeline_view_logs.yml
@@ -0,0 +1,21 @@
+description: "Show failed pipeline logs"
+category: "code_quality_walkthrough"
+action: failed_pipeline_view_logs
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_running_pipeline_dismissed.yml b/config/events/20210914201801_code_quality_walkthrough_running_pipeline_dismissed.yml
new file mode 100644
index 00000000000..6c0423f57e8
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_running_pipeline_dismissed.yml
@@ -0,0 +1,21 @@
+description: "Dismiss running pipeline"
+category: "code_quality_walkthrough"
+action: running_pipeline_dismissed
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_running_pipeline_displayed.yml b/config/events/20210914201801_code_quality_walkthrough_running_pipeline_displayed.yml
new file mode 100644
index 00000000000..73473b585f5
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_running_pipeline_displayed.yml
@@ -0,0 +1,21 @@
+description: "Show running pipeline"
+category: "code_quality_walkthrough"
+action: running_pipeline_displayed
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_success_pipeline_displayed.yml b/config/events/20210914201801_code_quality_walkthrough_success_pipeline_displayed.yml
new file mode 100644
index 00000000000..468242488f9
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_success_pipeline_displayed.yml
@@ -0,0 +1,21 @@
+description: "Show succeeded pipeline"
+category: "code_quality_walkthrough"
+action: success_pipeline_displayed
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_code_quality_walkthrough_success_pipeline_view_logs.yml b/config/events/20210914201801_code_quality_walkthrough_success_pipeline_view_logs.yml
new file mode 100644
index 00000000000..a14ee8f9100
--- /dev/null
+++ b/config/events/20210914201801_code_quality_walkthrough_success_pipeline_view_logs.yml
@@ -0,0 +1,21 @@
+description: "Show succeeded pipeline logs"
+category: "code_quality_walkthrough"
+action: success_pipeline_view_logs
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58900
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_action_button_name_click_button.yml b/config/events/20210914201801_default_action_button_name_click_button.yml
new file mode 100644
index 00000000000..d6fadb735d1
--- /dev/null
+++ b/config/events/20210914201801_default_action_button_name_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click 2FA codes related buttons: copy, download, print..."
+category: default
+action: click_button
+label_description: "Action button name"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category:
+milestone: "13.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49510
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_action_button_name_copy_keyboard_shortcut.yml b/config/events/20210914201801_default_action_button_name_copy_keyboard_shortcut.yml
new file mode 100644
index 00000000000..c1f792de52e
--- /dev/null
+++ b/config/events/20210914201801_default_action_button_name_copy_keyboard_shortcut.yml
@@ -0,0 +1,21 @@
+description: "Copy 2FA codes with keyboard shortcut"
+category: default
+action: copy_keyboard_shortcut
+label_description: "Action button name"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::compliance
+product_category:
+milestone: "13.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/49510
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_board_switcher_click_dropdown.yml b/config/events/20210914201801_default_board_switcher_click_dropdown.yml
new file mode 100644
index 00000000000..d4d63e1bd2b
--- /dev/null
+++ b/config/events/20210914201801_default_board_switcher_click_dropdown.yml
@@ -0,0 +1,21 @@
+description: "Click Epic's board switcher"
+category: default
+action: click_dropdown
+label_description: "`board_switcher`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: plan
+product_group: group::product_planning
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63765
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_cancel_delete.yml b/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_cancel_delete.yml
new file mode 100644
index 00000000000..425fe8089d3
--- /dev/null
+++ b/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_cancel_delete.yml
@@ -0,0 +1,21 @@
+description: "Cancel registry tag deletion"
+category: default
+action: cancel_delete
+label_description: "`[bulk_registry_tag_delete | registry_tag_delete]`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23154
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_click_button.yml b/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_click_button.yml
new file mode 100644
index 00000000000..42fa0c97066
--- /dev/null
+++ b/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click registry tag delete button"
+category: default
+action: click_button
+label_description: "`[bulk_registry_tag_delete | registry_tag_delete]`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23154
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_confirm_delete.yml b/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_confirm_delete.yml
new file mode 100644
index 00000000000..cc9481592ae
--- /dev/null
+++ b/config/events/20210914201801_default_bulk_registry_tag_delete_registry_tag_delete_confirm_delete.yml
@@ -0,0 +1,21 @@
+description: "Confirm registry tag deletion"
+category: default
+action: confirm_delete
+label_description: "`[bulk_registry_tag_delete | registry_tag_delete]`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23154
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_change_discussion_sort_direction.yml b/config/events/20210914201801_default_change_discussion_sort_direction.yml
new file mode 100644
index 00000000000..cb6e31910d3
--- /dev/null
+++ b/config/events/20210914201801_default_change_discussion_sort_direction.yml
@@ -0,0 +1,21 @@
+description: "Change discussion sort direction"
+category: default
+action: change_discussion_sort_direction
+label_description: ""
+property_description: "`[asc | desc]`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: plan
+product_group: group::product_planning
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28717
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_click_dismiss.yml b/config/events/20210914201801_default_click_dismiss.yml
new file mode 100644
index 00000000000..73605ad7878
--- /dev/null
+++ b/config/events/20210914201801_default_click_dismiss.yml
@@ -0,0 +1,21 @@
+description: "Dismiss home page banner"
+category: default
+action: click_dismiss
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "13.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39752
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_code_instruction_copy_composer_package_include_command.yml b/config/events/20210914201801_default_code_instruction_copy_composer_package_include_command.yml
new file mode 100644
index 00000000000..e2a923c0c3a
--- /dev/null
+++ b/config/events/20210914201801_default_code_instruction_copy_composer_package_include_command.yml
@@ -0,0 +1,21 @@
+description: "Copy Composer package include command"
+category: default
+action: copy_composer_package_include_command
+label_description: "`code_instruction`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "13.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38779
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_code_instruction_copy_composer_registry_include_command.yml b/config/events/20210914201801_default_code_instruction_copy_composer_registry_include_command.yml
new file mode 100644
index 00000000000..31714aacf50
--- /dev/null
+++ b/config/events/20210914201801_default_code_instruction_copy_composer_registry_include_command.yml
@@ -0,0 +1,21 @@
+description: "Copy Composer registry include command"
+category: default
+action: copy_composer_registry_include_command
+label_description: "`code_instruction`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "13.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38779
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_code_instruction_copy_gradle_add_to_source_command.yml b/config/events/20210914201801_default_code_instruction_copy_gradle_add_to_source_command.yml
new file mode 100644
index 00000000000..fa7c58eb2ef
--- /dev/null
+++ b/config/events/20210914201801_default_code_instruction_copy_gradle_add_to_source_command.yml
@@ -0,0 +1,21 @@
+description: "Copy Gradle add to source command"
+category: default
+action: copy_gradle_add_to_source_command
+label_description: "`code_instruction`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55738
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_code_instruction_copy_gradle_install_command.yml b/config/events/20210914201801_default_code_instruction_copy_gradle_install_command.yml
new file mode 100644
index 00000000000..5b016d38fbd
--- /dev/null
+++ b/config/events/20210914201801_default_code_instruction_copy_gradle_install_command.yml
@@ -0,0 +1,21 @@
+description: "Copy Gradle install command"
+category: default
+action: copy_gradle_install_command
+label_description: "`code_instruction`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "13.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/55738
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_code_instruction_copy_kotlin_add_to_source_command.yml b/config/events/20210914201801_default_code_instruction_copy_kotlin_add_to_source_command.yml
new file mode 100644
index 00000000000..d848afec43f
--- /dev/null
+++ b/config/events/20210914201801_default_code_instruction_copy_kotlin_add_to_source_command.yml
@@ -0,0 +1,21 @@
+description: "Copy Kotlin add to source command"
+category: default
+action: copy_kotlin_add_to_source_command
+label_description: "`code_instruction`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60097
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_code_instruction_copy_kotlin_install_command.yml b/config/events/20210914201801_default_code_instruction_copy_kotlin_install_command.yml
new file mode 100644
index 00000000000..187a500ba03
--- /dev/null
+++ b/config/events/20210914201801_default_code_instruction_copy_kotlin_install_command.yml
@@ -0,0 +1,21 @@
+description: "Copy Kotlin install command"
+category: default
+action: copy_kotlin_install_command
+label_description: "`code_instruction`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/60097
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_congratulate_first_pipeline_generic.yml b/config/events/20210914201801_default_congratulate_first_pipeline_generic.yml
new file mode 100644
index 00000000000..2c8a4d3ef4c
--- /dev/null
+++ b/config/events/20210914201801_default_congratulate_first_pipeline_generic.yml
@@ -0,0 +1,21 @@
+description: "Show a congratulation on first pipeline"
+category: default
+action: generic
+label_description: "`congratulate_first_pipeline`"
+property_description: "`[admin | maintainer | developer | owner]`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28378
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_content_editor_execute_bubble_menu_control.yml b/config/events/20210914201801_default_content_editor_execute_bubble_menu_control.yml
new file mode 100644
index 00000000000..03f4cd7e289
--- /dev/null
+++ b/config/events/20210914201801_default_content_editor_execute_bubble_menu_control.yml
@@ -0,0 +1,21 @@
+description: "Execute bubble menu control"
+category: default
+action: execute_bubble_menu_control
+label_description: "`content_editor`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.2"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/67363
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_content_editor_execute_input_rule.yml b/config/events/20210914201801_default_content_editor_execute_input_rule.yml
new file mode 100644
index 00000000000..4d0e518d07b
--- /dev/null
+++ b/config/events/20210914201801_default_content_editor_execute_input_rule.yml
@@ -0,0 +1,21 @@
+description: "Execute input rule"
+category: default
+action: execute_input_rule
+label_description: "`content_editor`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61248
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_content_editor_execute_keyboard_shortcut.yml b/config/events/20210914201801_default_content_editor_execute_keyboard_shortcut.yml
new file mode 100644
index 00000000000..2cd59d96ce7
--- /dev/null
+++ b/config/events/20210914201801_default_content_editor_execute_keyboard_shortcut.yml
@@ -0,0 +1,21 @@
+description: "Execute keyboard shortcut"
+category: default
+action: execute_keyboard_shortcut
+label_description: "`content_editor`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61248
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_content_editor_execute_toolbar_control.yml b/config/events/20210914201801_default_content_editor_execute_toolbar_control.yml
new file mode 100644
index 00000000000..8a9ea7fd068
--- /dev/null
+++ b/config/events/20210914201801_default_content_editor_execute_toolbar_control.yml
@@ -0,0 +1,21 @@
+description: "Execute toolbar control"
+category: default
+action: execute_toolbar_control
+label_description: "`content_editor`"
+property_description: "Content type"
+value_description: "Context data: [heading] 3, [heading] 2"
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/61065
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_docker_container_retention_and_expiration_policies_reset_form.yml b/config/events/20210914201801_default_docker_container_retention_and_expiration_policies_reset_form.yml
new file mode 100644
index 00000000000..c6a57c45971
--- /dev/null
+++ b/config/events/20210914201801_default_docker_container_retention_and_expiration_policies_reset_form.yml
@@ -0,0 +1,21 @@
+description: "Reset Docker form"
+category: default
+action: reset_form
+label_description: "`docker_container_retention_and_expiration_policies`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23844
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_docker_container_retention_and_expiration_policies_submit_form.yml b/config/events/20210914201801_default_docker_container_retention_and_expiration_policies_submit_form.yml
new file mode 100644
index 00000000000..2e822fe5242
--- /dev/null
+++ b/config/events/20210914201801_default_docker_container_retention_and_expiration_policies_submit_form.yml
@@ -0,0 +1,21 @@
+description: "Submit Docker form"
+category: default
+action: submit_form
+label_description: "`docker_container_retention_and_expiration_policies`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23844
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_dropdown_type_dropdown_frequent_items_list_item_click_link.yml b/config/events/20210914201801_default_dropdown_type_dropdown_frequent_items_list_item_click_link.yml
new file mode 100644
index 00000000000..cb9d3a3dffa
--- /dev/null
+++ b/config/events/20210914201801_default_dropdown_type_dropdown_frequent_items_list_item_click_link.yml
@@ -0,0 +1,21 @@
+description: "Open frequent items dropdown"
+category: default
+action: click_link
+label_description: "`[dropdown_type]_dropdown_frequent_items_list_item`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "13.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47589
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_dropdown_type_dropdown_frequent_items_search_input_type_search_query.yml b/config/events/20210914201801_default_dropdown_type_dropdown_frequent_items_search_input_type_search_query.yml
new file mode 100644
index 00000000000..274613bd201
--- /dev/null
+++ b/config/events/20210914201801_default_dropdown_type_dropdown_frequent_items_search_input_type_search_query.yml
@@ -0,0 +1,21 @@
+description: "Type search query"
+category: default
+action: type_search_query
+label_description: "`[dropdown_type]_dropdown_frequent_items_search_input`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "13.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47589
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_invite_members_banner_invite_members_banner_button_clicked.yml b/config/events/20210914201801_default_invite_members_banner_invite_members_banner_button_clicked.yml
new file mode 100644
index 00000000000..adbea725085
--- /dev/null
+++ b/config/events/20210914201801_default_invite_members_banner_invite_members_banner_button_clicked.yml
@@ -0,0 +1,21 @@
+description: "Click invite members banner"
+category: default
+action: invite_members_banner_button_clicked
+label_description: "`invite_members_banner`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "13.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41774
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_invite_members_banner_invite_members_banner_dismissed.yml b/config/events/20210914201801_default_invite_members_banner_invite_members_banner_dismissed.yml
new file mode 100644
index 00000000000..2041df2f058
--- /dev/null
+++ b/config/events/20210914201801_default_invite_members_banner_invite_members_banner_dismissed.yml
@@ -0,0 +1,21 @@
+description: "Dismiss invite members banner"
+category: default
+action: invite_members_banner_dismissed
+label_description: "`invite_members_banner`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "13.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41774
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_namespace_id_click_whats_new_drawer.yml b/config/events/20210914201801_default_namespace_id_click_whats_new_drawer.yml
new file mode 100644
index 00000000000..8a994510fc7
--- /dev/null
+++ b/config/events/20210914201801_default_namespace_id_click_whats_new_drawer.yml
@@ -0,0 +1,21 @@
+description: "Show \"What's new\" drawer"
+category: default
+action: click_whats_new_drawer
+label_description: "`namespace_id`"
+property_description: "ID of namespace"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::adoption
+product_category:
+milestone: "13.5"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42653
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_no_pipeline_noticed_generic.yml b/config/events/20210914201801_default_no_pipeline_noticed_generic.yml
new file mode 100644
index 00000000000..3e6169f1c68
--- /dev/null
+++ b/config/events/20210914201801_default_no_pipeline_noticed_generic.yml
@@ -0,0 +1,21 @@
+description: "Show Pipeline suggestion on new MRs"
+category: default
+action: generic
+label_description: "`no_pipeline_noticed`"
+property_description: "`[admin | maintainer | developer | owner]`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/35069
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_panel_name_click_tab.yml b/config/events/20210914201801_default_panel_name_click_tab.yml
new file mode 100644
index 00000000000..e61ce545f7b
--- /dev/null
+++ b/config/events/20210914201801_default_panel_name_click_tab.yml
@@ -0,0 +1,21 @@
+description: "Click tab on new namespace welcoming component"
+category: default
+action: click_tab
+label_description: "Panel name"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: manage
+product_group: group::import
+product_category:
+milestone: "13.12"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/59452
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_pipeline_editor_browse_templates.yml b/config/events/20210914201801_default_pipeline_editor_browse_templates.yml
new file mode 100644
index 00000000000..e7ae4423bc1
--- /dev/null
+++ b/config/events/20210914201801_default_pipeline_editor_browse_templates.yml
@@ -0,0 +1,21 @@
+description: "Browse Pipeline editor templates"
+category: default
+action: browse_templates
+label_description: "`pipeline_editor`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: verify
+product_group: group::pipeline_authoring
+product_category:
+milestone: "14.1"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64349
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_quickstart_dropdown_click_copy_build.yml b/config/events/20210914201801_default_quickstart_dropdown_click_copy_build.yml
new file mode 100644
index 00000000000..86ee97b4b3a
--- /dev/null
+++ b/config/events/20210914201801_default_quickstart_dropdown_click_copy_build.yml
@@ -0,0 +1,21 @@
+description: "Copy quickstart dropdown build"
+category: default
+action: click_copy_build
+label_description: "`quickstart_dropdown`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27990
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_quickstart_dropdown_click_copy_login.yml b/config/events/20210914201801_default_quickstart_dropdown_click_copy_login.yml
new file mode 100644
index 00000000000..05283da858d
--- /dev/null
+++ b/config/events/20210914201801_default_quickstart_dropdown_click_copy_login.yml
@@ -0,0 +1,21 @@
+description: "Copy quickstart dropdown login"
+category: default
+action: click_copy_login
+label_description: "`quickstart_dropdown`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27990
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_quickstart_dropdown_click_copy_push.yml b/config/events/20210914201801_default_quickstart_dropdown_click_copy_push.yml
new file mode 100644
index 00000000000..87de403e7de
--- /dev/null
+++ b/config/events/20210914201801_default_quickstart_dropdown_click_copy_push.yml
@@ -0,0 +1,21 @@
+description: "Copy quickstart dropdown push"
+category: default
+action: click_copy_push
+label_description: "`quickstart_dropdown`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27990
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_quickstart_dropdown_click_dropdown.yml b/config/events/20210914201801_default_quickstart_dropdown_click_dropdown.yml
new file mode 100644
index 00000000000..61c04baab8d
--- /dev/null
+++ b/config/events/20210914201801_default_quickstart_dropdown_click_dropdown.yml
@@ -0,0 +1,21 @@
+description: "Click quickstart dropdown"
+category: default
+action: click_dropdown
+label_description: "`quickstart_dropdown`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.10"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/27990
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_registry_repository_delete_cancel_delete.yml b/config/events/20210914201801_default_registry_repository_delete_cancel_delete.yml
new file mode 100644
index 00000000000..99623717a84
--- /dev/null
+++ b/config/events/20210914201801_default_registry_repository_delete_cancel_delete.yml
@@ -0,0 +1,21 @@
+description: "Cancel registry repository deletion"
+category: default
+action: cancel_delete
+label_description: "`registry_repository_delete`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23154
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_registry_repository_delete_click_button.yml b/config/events/20210914201801_default_registry_repository_delete_click_button.yml
new file mode 100644
index 00000000000..56329982262
--- /dev/null
+++ b/config/events/20210914201801_default_registry_repository_delete_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click registry repository delete button"
+category: default
+action: click_button
+label_description: "`registry_repository_delete`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23154
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_registry_repository_delete_confirm_delete.yml b/config/events/20210914201801_default_registry_repository_delete_confirm_delete.yml
new file mode 100644
index 00000000000..1939df91927
--- /dev/null
+++ b/config/events/20210914201801_default_registry_repository_delete_confirm_delete.yml
@@ -0,0 +1,21 @@
+description: "Confirm registry repository deletion"
+category: default
+action: confirm_delete
+label_description: "`registry_repository_delete`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "12.8"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/23154
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_show_home_page_banner.yml b/config/events/20210914201801_default_show_home_page_banner.yml
new file mode 100644
index 00000000000..b33e51205a3
--- /dev/null
+++ b/config/events/20210914201801_default_show_home_page_banner.yml
@@ -0,0 +1,21 @@
+description: "Show home page banner"
+category: default
+action: show_home_page_banner
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "13.4"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/39752
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_suggest_commit_first_project_gitlab_ci_yml_generic.yml b/config/events/20210914201801_default_suggest_commit_first_project_gitlab_ci_yml_generic.yml
new file mode 100644
index 00000000000..7d4f5efe3ba
--- /dev/null
+++ b/config/events/20210914201801_default_suggest_commit_first_project_gitlab_ci_yml_generic.yml
@@ -0,0 +1,21 @@
+description: "Show GitLab CI suggestion popover"
+category: default
+action: generic
+label_description: "`suggest_commit_first_project_gitlab_ci_yml`"
+property_description: "`[admin | maintainer | developer | owner]`"
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::expansion
+product_category:
+milestone: "12.9"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26605
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_template_name_or_"getting-started"_template_clicked.yml b/config/events/20210914201801_default_template_name_or_"getting-started"_template_clicked.yml
new file mode 100644
index 00000000000..277190af855
--- /dev/null
+++ b/config/events/20210914201801_default_template_name_or_"getting-started"_template_clicked.yml
@@ -0,0 +1,21 @@
+description: "Click pipeline empty state template"
+category: default
+action: template_clicked
+label_description: "Template name or \"Getting-Started\""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: growth
+product_stage: growth
+product_group: group::activation
+product_category:
+milestone: "13.11"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/58808
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_terraform_banner_click_button.yml b/config/events/20210914201801_default_terraform_banner_click_button.yml
new file mode 100644
index 00000000000..356117f6cb6
--- /dev/null
+++ b/config/events/20210914201801_default_terraform_banner_click_button.yml
@@ -0,0 +1,21 @@
+description: "Click Terraform banner button"
+category: default
+action: click_button
+label_description: "`terraform_banner`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category:
+milestone: "14.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68467
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_terraform_banner_dismiss_banner.yml b/config/events/20210914201801_default_terraform_banner_dismiss_banner.yml
new file mode 100644
index 00000000000..7eb23fca354
--- /dev/null
+++ b/config/events/20210914201801_default_terraform_banner_dismiss_banner.yml
@@ -0,0 +1,21 @@
+description: "Dismiss Terraform banner"
+category: default
+action: dismiss_banner
+label_description: "`terraform_banner`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: configure
+product_group: group::configure
+product_category:
+milestone: "14.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/68467
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_wiki_content_editor_content_editor_loaded.yml b/config/events/20210914201801_default_wiki_content_editor_content_editor_loaded.yml
new file mode 100644
index 00000000000..fd223e5368d
--- /dev/null
+++ b/config/events/20210914201801_default_wiki_content_editor_content_editor_loaded.yml
@@ -0,0 +1,21 @@
+description: "Wiki content editor loaded"
+category: default
+action: content_editor_loaded
+label_description: "`wiki_content_editor`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62919
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_default_wiki_content_editor_saved_using_content_editor.yml b/config/events/20210914201801_default_wiki_content_editor_saved_using_content_editor.yml
new file mode 100644
index 00000000000..805ed60a992
--- /dev/null
+++ b/config/events/20210914201801_default_wiki_content_editor_saved_using_content_editor.yml
@@ -0,0 +1,21 @@
+description: "Wiki saved using content editor"
+category: default
+action: saved_using_content_editor
+label_description: "`wiki_content_editor`"
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: dev
+product_stage: create
+product_group: group::editor
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62919
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_packages_cancel_delete_package_file.yml b/config/events/20210914201801_packages_cancel_delete_package_file.yml
new file mode 100644
index 00000000000..aa0bff61257
--- /dev/null
+++ b/config/events/20210914201801_packages_cancel_delete_package_file.yml
@@ -0,0 +1,21 @@
+description: "Cancel deletion of items from the package file list"
+category: "UI:[MavenPackages | NpmPackages | ConanPackages | undefined]"
+action: cancel_delete_package_file
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62179
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_packages_delete_package_file.yml b/config/events/20210914201801_packages_delete_package_file.yml
new file mode 100644
index 00000000000..ed1dd7ce766
--- /dev/null
+++ b/config/events/20210914201801_packages_delete_package_file.yml
@@ -0,0 +1,21 @@
+description: "Delete items from the package file list"
+category: "UI:[MavenPackages | NpmPackages | ConanPackages | undefined]"
+action: delete_package_file
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62179
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_packages_pull_package.yml b/config/events/20210914201801_packages_pull_package.yml
new file mode 100644
index 00000000000..1288724d172
--- /dev/null
+++ b/config/events/20210914201801_packages_pull_package.yml
@@ -0,0 +1,21 @@
+description: "Download package"
+category: "UI:[MavenPackages | NpmPackages | ConanPackages | undefined]"
+action: pull_package
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "13.7"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/48451
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/events/20210914201801_packages_request_delete_package_file.yml b/config/events/20210914201801_packages_request_delete_package_file.yml
new file mode 100644
index 00000000000..e12b96c7106
--- /dev/null
+++ b/config/events/20210914201801_packages_request_delete_package_file.yml
@@ -0,0 +1,21 @@
+description: "Request deletion of items from the package file list"
+category: "UI:[MavenPackages | NpmPackages | ConanPackages | undefined]"
+action: request_delete_package_file
+label_description: ""
+property_description: ""
+value_description: ""
+extra_properties:
+identifiers:
+product_section: ops
+product_stage: package
+product_group: group::package
+product_category:
+milestone: "14.0"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/62179
+distributions:
+- ce
+- ee
+tiers:
+- free
+- premium
+- ultimate
diff --git a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml b/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
deleted file mode 100644
index 5d3274c6452..00000000000
--- a/config/metrics/counts_28d/20210216183631_two-factor-via-u2f-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-u2f-device
-description: Number of unique user logins using two factor via a U2F device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml b/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
deleted file mode 100644
index c6d88ac5928..00000000000
--- a/config/metrics/counts_28d/20210216183633_two-factor-via-webauthn-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor-via-webauthn-device
-description: Number of unique user logins using two factor via a WebAuthn device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183634_standard.yml b/config/metrics/counts_28d/20210216183634_standard.yml
deleted file mode 100644
index 9efb95d6c49..00000000000
--- a/config/metrics/counts_28d/20210216183634_standard.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.standard
-description: Number of unique user logins using password authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-performance_indicator_type: []
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183636_google_oauth2.yml b/config/metrics/counts_28d/20210216183636_google_oauth2.yml
deleted file mode 100644
index ed16c7a81fa..00000000000
--- a/config/metrics/counts_28d/20210216183636_google_oauth2.yml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.google_oauth2
-description: Number of unique user logins using Google OAuth authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: 28d
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-performance_indicator_type: []
-milestone: "<13.9"
diff --git a/config/metrics/counts_28d/20210216183629_two-factor.yml b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
index df1e06e4d52..9a2d93e597e 100644
--- a/config/metrics/counts_28d/20210216183629_two-factor.yml
+++ b/config/metrics/counts_28d/20210910132229_user_auth_by_provider.yml
@@ -1,19 +1,24 @@
 ---
-data_category: optional
-key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider.two-factor
-description: Number of unique user logins using two factor authentication
+key_path: usage_activity_by_stage_monthly.manage.user_auth_by_provider
+name: count_distinct_users_using_two_factor_authentication
+description: Number of unique user logins using two factor authentication for available providers
 product_section: dev
 product_stage: manage
 product_group: group::access
 product_category: authentication_and_authorization
-value_type: number
+value_type: object
 status: active
+milestone: "14.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70061
 time_frame: 28d
 data_source: database
+data_category: optional
+performance_indicator_type: []
 distribution:
 - ce
+- ee
 tier:
 - free
 - premium
 - ultimate
-milestone: "<13.9"
+value_json_schema: "config/metrics/objects_schemas/user_auth_by_provider.json"
diff --git a/config/metrics/counts_all/20210216183402_two-factor.yml b/config/metrics/counts_all/20210216183402_two-factor.yml
deleted file mode 100644
index 7b396fc6c73..00000000000
--- a/config/metrics/counts_all/20210216183402_two-factor.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor
-description: Number of unique user logins using two factor authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml b/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
deleted file mode 100644
index 0206e7c017f..00000000000
--- a/config/metrics/counts_all/20210216183404_two-factor-via-u2f-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-u2f-device
-description: Number of unique user logins using two factor via a U2F device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml b/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
deleted file mode 100644
index 79e4bd71c94..00000000000
--- a/config/metrics/counts_all/20210216183406_two-factor-via-webauthn-device.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.two-factor-via-webauthn-device
-description: Number of unique user logins using two factor via a WebAuthn device
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183408_standard.yml b/config/metrics/counts_all/20210216183408_standard.yml
deleted file mode 100644
index 6c43a6cbc95..00000000000
--- a/config/metrics/counts_all/20210216183408_standard.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.standard
-description: Number of unique user logins using password authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210216183410_google_oauth2.yml b/config/metrics/counts_all/20210216183410_google_oauth2.yml
deleted file mode 100644
index d75fcebed09..00000000000
--- a/config/metrics/counts_all/20210216183410_google_oauth2.yml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-data_category: optional
-key_path: usage_activity_by_stage.manage.user_auth_by_provider.google_oauth2
-description: Number of unique user logins using Google OAuth authentication
-product_section: dev
-product_stage: manage
-product_group: group::access
-product_category: authentication_and_authorization
-value_type: number
-status: active
-time_frame: all
-data_source: database
-distribution:
-- ce
-tier:
-- free
-- premium
-- ultimate
-milestone: "<13.9"
diff --git a/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
new file mode 100644
index 00000000000..610c187407b
--- /dev/null
+++ b/config/metrics/counts_all/20210910132001_user_auth_by_provider.yml
@@ -0,0 +1,24 @@
+---
+key_path: usage_activity_by_stage.manage.user_auth_by_provider
+name: count_distinct_users_using_two_factor_authentication
+description: Number of unique user logins using two factor authentication for available providers
+product_section: dev
+product_stage: manage
+product_group: group::access
+product_category: authentication_and_authorization
+value_type: object
+status: active
+milestone: "14.3"
+introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70061
+time_frame: all
+data_source: database
+data_category: optional
+performance_indicator_type: []
+distribution:
+- ce
+- ee
+tier:
+- free
+- premium
+- ultimate
+value_json_schema: "config/metrics/objects_schemas/user_auth_by_provider.json"
diff --git a/config/metrics/objects_schemas/user_auth_by_provider.json b/config/metrics/objects_schemas/user_auth_by_provider.json
new file mode 100644
index 00000000000..9cf4c1d68aa
--- /dev/null
+++ b/config/metrics/objects_schemas/user_auth_by_provider.json
@@ -0,0 +1,16 @@
+{
+  "type": "object",
+  "description": "Distinct users by provider",
+  "properties": {
+    "two-factor": {"type": "number", "description": " Number of unique user logins using two factor authentication" },
+    "two-factor-via-u2f-device": {"type": "number", "description": " Number of unique user logins using two factor authentication via U2F" },
+    "two-factor-via-webauthn-device": {"type": "number", "description": " Number of unique user logins using two factor authentication via two-factor-via-webauthn-device" },
+    "standard": {"type": "number", "description": " Number of unique user logins using password authentication" },
+    "google_oauth2": {"type": "number", "description": " Number of unique user logins using Google OAuth authentication" },
+    "twitter": {"type": "number", "description": " Number of unique user logins using Twitter authentication" },
+    "github": {"type": "number", "description": " Number of unique user logins using Github authentication" },
+    "bitbucket": {"type": "number", "description": " Number of unique user logins using Bitbucket authentication" },
+    "group_saml": {"type": "number", "description": " Number of unique user logins using group SAML authentication" },
+    "salesforce": {"type": "number", "description": " Number of unique user logins using group Salesforce authentication" }
+  }
+}
diff --git a/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml b/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml
new file mode 100644
index 00000000000..d02577d34fe
--- /dev/null
+++ b/data/deprecations/14-3-database-deprecate-legacy-database-conf.yml
@@ -0,0 +1,12 @@
+- name: "Legacy database configuration"
+  announcement_milestone: "14.3"
+  removal_milestone: "15.0"
+  body: |
+   The syntax of [GitLabs database](https://docs.gitlab.com/omnibus/settings/database.html)
+   configuration located in `database.yml` is changing and the legacy format is deprecated. The legacy format
+   supported using a single PostgreSQL adapter, whereas the new format is changing to support multiple databases. The `main:` database needs to be defined as a first configuration item.
+   
+   This deprecation mainly impacts users compiling GitLab from source because Omnibus will handle this configuration automatically.
+  stage: Enablement
+  tiers: [Core, Premium, Ultimate]
+  issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/338182
diff --git a/data/deprecations/distribution_deprecations_14-3.yml b/data/deprecations/distribution_deprecations_14-3.yml
new file mode 100644
index 00000000000..e43cc7baf09
--- /dev/null
+++ b/data/deprecations/distribution_deprecations_14-3.yml
@@ -0,0 +1,7 @@
+- name: "Rename Task Runner pod to Toolbox" # The name of the feature to be deprecated
+  announcement_milestone: "14.2" # The milestone when this feature was first announced as deprecated.
+  removal_milestone: "14.4" # the milestone when this feature is planned to be removed
+  body: | # Do not modify this line, instead modify the lines below.
+    The Task Runner pod is used to execute periodic housekeeping tasks within the GitLab application and is often confused with the GitLab Runner. Thus, [Task Runner will be renamed to Toolbox](https://gitlab.com/groups/gitlab-org/charts/-/epics/25).
+
+    This will result in the rename of the sub-chart: `gitlab/task-runner` to `gitlab/toolbox`. Resulting pods will be named along the lines of `{{ .Release.Name }}-toolbox`, which will often be `gitlab-toolbox`. They will be locatable with the label `app=toolbox`.
diff --git a/doc/administration/geo/replication/updating_the_geo_sites.md b/doc/administration/geo/replication/updating_the_geo_sites.md
index 1213fd904ee..e82afe5f0d4 100644
--- a/doc/administration/geo/replication/updating_the_geo_sites.md
+++ b/doc/administration/geo/replication/updating_the_geo_sites.md
@@ -21,16 +21,18 @@ Updating Geo sites involves performing:
 ## General update steps
 
 NOTE:
-These general update steps are not intended for [high-availability deployments](https://docs.gitlab.com/omnibus/update/README.html#multi-node--ha-deployment), and will cause downtime. If you want to avoid downtime, consider using [zero downtime updates](https://docs.gitlab.com/omnibus/update/README.html#zero-downtime-updates).
+These general update steps are not intended for multi-site deployments,
+and will cause downtime. If you want to avoid downtime, consider using
+[zero downtime upgrades](../../../update/zero_downtime.md#multi-node--ha-deployment-with-geo).
 
 To update the Geo sites when a new GitLab version is released, update **primary**
 and all **secondary** sites:
 
 1. **Optional:** [Pause replication on each **secondary** sites.](../index.md#pausing-and-resuming-replication)
 1. SSH into each node of the **primary** site.
-1. [Update GitLab on the **primary** site using Omnibus](https://docs.gitlab.com/omnibus/update/#update-using-the-official-repositories).
+1. [Upgrade GitLab on the **primary** site](../../../update/package/index.md#upgrade-using-the-official-repositories).
 1. SSH into each node of **secondary** sites.
-1. [Update GitLab on each **secondary** site using Omnibus](https://docs.gitlab.com/omnibus/update/#update-using-the-official-repositories).
+1. [Upgrade GitLab on each **secondary** site](../../../update/package/index.md#upgrade-using-the-official-repositories).
 1. If you paused replication in step 1, [resume replication on each **secondary**](../index.md#pausing-and-resuming-replication)
 1. [Test](#check-status-after-updating) **primary** and **secondary** sites, and check version in each.
 
diff --git a/doc/administration/geo/replication/version_specific_updates.md b/doc/administration/geo/replication/version_specific_updates.md
index c93a7cc90e1..84193e6baac 100644
--- a/doc/administration/geo/replication/version_specific_updates.md
+++ b/doc/administration/geo/replication/version_specific_updates.md
@@ -312,7 +312,7 @@ GitLab 12.2 includes the following minor PostgreSQL updates:
 
 This update occurs even if major PostgreSQL updates are disabled.
 
-Before [refreshing Foreign Data Wrapper during a Geo upgrade](https://docs.gitlab.com/omnibus/update/README.html#run-post-deployment-migrations-and-checks),
+Before [refreshing Foreign Data Wrapper during a Geo upgrade](../../../update/zero_downtime.md#step-4-run-post-deployment-migrations-and-checks),
 restart the Geo tracking database:
 
 ```shell
diff --git a/doc/administration/gitaly/configure_gitaly.md b/doc/administration/gitaly/configure_gitaly.md
index 049fe709a9d..d0841f4e607 100644
--- a/doc/administration/gitaly/configure_gitaly.md
+++ b/doc/administration/gitaly/configure_gitaly.md
@@ -41,9 +41,8 @@ However, Gitaly can be deployed to its own server, which can benefit GitLab inst
 multiple machines.
 
 NOTE:
-When configured to run on their own servers, Gitaly servers
-[must be upgraded](https://docs.gitlab.com/omnibus/update/#upgrading-gitaly-servers) before Gitaly
-clients in your cluster.
+When configured to run on their own servers, Gitaly servers must be
+[upgraded](../../update/package/index.md) before Gitaly clients in your cluster.
 
 The process for setting up Gitaly on its own server is:
 
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index 4ad9eb8c241..d58bb1e88b5 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -20,10 +20,6 @@ Configure Gitaly Cluster using either:
 
 Smaller GitLab installations may need only [Gitaly itself](index.md).
 
-NOTE:
-Upgrade instructions for Omnibus GitLab installations
-[are available](https://docs.gitlab.com/omnibus/update/#gitaly-cluster).
-
 ## Requirements
 
 The minimum recommended configuration for a Gitaly Cluster requires:
diff --git a/doc/administration/postgresql/pgbouncer.md b/doc/administration/postgresql/pgbouncer.md
index 7171e90949e..e215622bbc7 100644
--- a/doc/administration/postgresql/pgbouncer.md
+++ b/doc/administration/postgresql/pgbouncer.md
@@ -173,7 +173,7 @@ ote_pid | tls
 Some database changes have to be done directly, and not through PgBouncer.
 
 Read more about the affected tasks: [database restores](../../raketasks/backup_restore.md#backup-and-restore-for-installations-using-pgbouncer)
-and [GitLab upgrades](https://docs.gitlab.com/omnibus/update/README.html#use-postgresql-ha).
+and [GitLab upgrades](../../update/zero_downtime.md#use-postgresql-ha).
 
 1. To find the primary node, run the following on a database node:
 
diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md
index 74d8bf39d03..4d95a61176b 100644
--- a/doc/administration/reference_architectures/index.md
+++ b/doc/administration/reference_architectures/index.md
@@ -139,8 +139,8 @@ to any of the [available reference architectures](#available-reference-architect
 > - Level of complexity: **Medium**
 > - Required domain knowledge: PostgreSQL, HAProxy, shared storage, distributed systems
 
-GitLab supports [zero-downtime updates](https://docs.gitlab.com/omnibus/update/#zero-downtime-updates).
-Single GitLab nodes can be updated with only a [few minutes of downtime](https://docs.gitlab.com/omnibus/update/README.html#single-node-deployment).
+GitLab supports [zero-downtime upgrades](../../update/zero_downtime.md).
+Single GitLab nodes can be updated with only a [few minutes of downtime](../../update/zero_downtime.md#single-node-deployment).
 To avoid this, we recommend to separate GitLab into several application nodes.
 As long as at least one of each component is online and capable of handling the instance's usage load, your team's productivity will not be interrupted during the update.
 
diff --git a/doc/ci/yaml/index.md b/doc/ci/yaml/index.md
index 6f55d1b3604..fb5748788f7 100644
--- a/doc/ci/yaml/index.md
+++ b/doc/ci/yaml/index.md
@@ -3774,25 +3774,19 @@ The trigger token is different than the [`trigger`](#trigger) keyword.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/32022) in GitLab 12.3.
 
-Use `interruptible` to indicate that a running job should be canceled if made redundant by a newer pipeline run.
-Defaults to `false` (uninterruptible). Jobs that have not started yet (pending) are considered interruptible
-and safe to be cancelled.
-This value is used only if the [automatic cancellation of redundant pipelines feature](../pipelines/settings.md#auto-cancel-redundant-pipelines)
-is enabled.
+Use `interruptible` if a job should be canceled when a newer pipeline starts before the job completes.
 
-When enabled, a pipeline is immediately canceled when a new pipeline starts on the same branch if either of the following is true:
+This keyword is used with the [automatic cancellation of redundant pipelines](../pipelines/settings.md#auto-cancel-redundant-pipelines)
+feature. When enabled, a running job with `interruptible: true` can be cancelled when
+a new pipeline starts on the same branch.
 
-- All jobs in the pipeline are set as interruptible.
-- Any uninterruptible jobs have not started yet.
+You can't cancel subsequent jobs after a job with `interruptible: false` starts.
 
-Set jobs as interruptible that can be safely canceled once started (for instance, a build job).
-
-In the following example, a new pipeline run causes an existing running pipeline to be:
+**Keyword type**: Job keyword. You can use it only as part of a job.
 
-- Canceled, if only `step-1` is running or pending.
-- Not canceled, once `step-2` starts running.
+**Possible inputs**: `true` or `false` (default).
 
-After an uninterruptible job starts running, the pipeline cannot be canceled.
+**Example of `interruptible`**:
 
 ```yaml
 stages:
@@ -3818,6 +3812,18 @@ step-3:
   interruptible: true
 ```
 
+In this example, a new pipeline causes a running pipeline to be:
+
+- Canceled, if only `step-1` is running or pending.
+- Not canceled, after `step-2` starts.
+
+**Additional details**:
+
+- Only set `interruptible: true` if the job can be safely canceled after it has started,
+  like a build job. Deployment jobs usually shouldn't be cancelled, to prevent partial deployments.
+- To completely cancel a running pipeline, all jobs must have `interruptible: true`,
+  or `interruptible: false` jobs must not have started.
+
 ### `resource_group`
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/15536) in GitLab 12.7.
@@ -4351,15 +4357,12 @@ name level and not in the `vault` section.
 
 ### `pages`
 
-Use `pages` to upload static content to GitLab. The content
-is then published as a website. You must:
+Use `pages` to define a [GitLab Pages](../../user/project/pages/index.md) job that
+uploads static content to GitLab. The content is then published as a website.
 
-- Place any static content in a `public/` directory.
-- Define [`artifacts`](#artifacts) with a path to the `public/` directory.
+**Keyword type**: Job name.
 
-The following example moves all files from the root of the project to the
-`public/` directory. The `.public` workaround is so `cp` does not also copy
-`public/` to itself in an infinite loop:
+**Example of `pages`**:
 
 ```yaml
 pages:
@@ -4375,7 +4378,15 @@ pages:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
 ```
 
-View the [GitLab Pages user documentation](../../user/project/pages/index.md).
+This example moves all files from the root of the project to the `public/` directory.
+The `.public` workaround is so `cp` does not also copy `public/` to itself in an infinite loop.
+
+**Additional details**:
+
+You must:
+
+- Place any static content in a `public/` directory.
+- Define [`artifacts`](#artifacts) with a path to the `public/` directory.
 
 ### `inherit`
 
diff --git a/doc/development/multi_version_compatibility.md b/doc/development/multi_version_compatibility.md
index 3314b5e7ddc..af14fb73672 100644
--- a/doc/development/multi_version_compatibility.md
+++ b/doc/development/multi_version_compatibility.md
@@ -124,7 +124,7 @@ GitLab.com, the feature can be enabled in ChatOps and validated on GitLab.com.
 
 **However, it is not necessarily safe to enable the feature by default.** If the
 feature flag is removed, or the default is flipped to enabled, in the same release
-where the code was merged, then customers performing [zero-downtime updates](https://docs.gitlab.com/omnibus/update/#zero-downtime-updates)
+where the code was merged, then customers performing [zero-downtime updates](../update/zero_downtime.md)
 will end up running the new frontend code against the previous release's API.
 
 If you're not sure whether it's safe to enable all the changes at once, then one
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index d8b36fcaa6d..f7c64895c78 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -64,10 +64,10 @@ one major version. For example, it is safe to:
   - `12.10.1` -> `12.10.8`
 
 NOTE:
-Version specific changes in Omnibus GitLab Linux packages can be found in [the Omnibus GitLab documentation](https://docs.gitlab.com/omnibus/update/README.html#version-specific-changes).
+Version specific changes in Omnibus GitLab Linux packages can be found in [the Omnibus GitLab documentation](../update/package/index.md#version-specific-changes).
 
 NOTE:
-Instructions are available for downloading an Omnibus GitLab Linux package locally and [manually installing](https://docs.gitlab.com/omnibus/manual_install.html) it.
+Instructions are available for downloading an Omnibus GitLab Linux package locally and [manually installing](../update/package/index.md#upgrade-using-a-manually-downloaded-package) it.
 
 NOTE:
 A step-by-step guide to [upgrading the Omnibus-bundled PostgreSQL is documented separately](https://docs.gitlab.com/omnibus/settings/database.html#upgrade-packaged-postgresql-server).
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 468081ffdae..cddf62644d4 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -810,7 +810,7 @@ You can restore a backup only to _the exact same version and type (CE/EE)_ of
 GitLab that you created it on (for example CE 9.1.0).
 
 If your backup is a different version than the current installation, you must
-[downgrade your GitLab installation](https://docs.gitlab.com/omnibus/update/README.html#downgrade)
+[downgrade your GitLab installation](../update/package/downgrade.md)
 before restoring the backup.
 
 ### Restore prerequisites
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index 61cb29001dd..1d66ad35024 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -373,6 +373,8 @@ applications.
 |-----------------------------------------|------------------------------------|
 | `ADDITIONAL_HOSTS`                      | Fully qualified domain names specified as a comma-separated list that are added to the Ingress hosts. |
 | `<ENVIRONMENT>_ADDITIONAL_HOSTS`        | For a specific environment, the fully qualified domain names specified as a comma-separated list that are added to the Ingress hosts. This takes precedence over `ADDITIONAL_HOSTS`. |
+| `AUTO_BUILD_IMAGE_VERSION`              | Customize the image version used for the `build` job. See [list of versions](https://gitlab.com/gitlab-org/cluster-integration/auto-build-image/-/releases). |
+| `AUTO_DEPLOY_IMAGE_VERSION`            | Customize the image version used for Kubernetes deployment jobs. See [list of versions](https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/releases). |
 | `AUTO_DEVOPS_ATOMIC_RELEASE`            | As of GitLab 13.0, Auto DevOps uses [`--atomic`](https://v2.helm.sh/docs/helm/#options-43) for Helm deployments by default. Set this variable to `false` to disable the use of `--atomic` |
 | `AUTO_DEVOPS_BUILD_IMAGE_CNB_ENABLED`   | Set to `false` to use Herokuish instead of Cloud Native Buildpacks with Auto Build. [More details](stages.md#auto-build-using-cloud-native-buildpacks). |
 | `AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER`   | The builder used when building with Cloud Native Buildpacks. The default builder is `heroku/buildpacks:18`. [More details](stages.md#auto-build-using-cloud-native-buildpacks). |
@@ -390,6 +392,7 @@ applications.
 | `CANARY_ENABLED`                        | From GitLab 11.0, used to define a [deploy policy for canary environments](#deploy-policy-for-canary-environments). |
 | `CANARY_PRODUCTION_REPLICAS`            | Number of canary replicas to deploy for [Canary Deployments](../../user/project/canary_deployments.md) in the production environment. Takes precedence over `CANARY_REPLICAS`. Defaults to 1. |
 | `CANARY_REPLICAS`                       | Number of canary replicas to deploy for [Canary Deployments](../../user/project/canary_deployments.md). Defaults to 1. |
+| `DAST_AUTO_DEPLOY_IMAGE_VERSION`        | Customize the image version used for DAST deployments on the default branch. Should usually be the same as `AUTO_DEPLOY_IMAGE_VERSION`. See [list of versions](https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/releases). |
 | `DOCKERFILE_PATH`                       | From GitLab 13.2, allows overriding the [default Dockerfile path for the build stage](#custom-dockerfile) |
 | `HELM_RELEASE_NAME`                     | From GitLab 12.1, allows the `helm` release name to be overridden. Can be used to assign unique release names when deploying multiple projects to a single namespace. |
 | `HELM_UPGRADE_VALUES_FILE`              | From GitLab 12.6, allows the `helm upgrade` values file to be overridden. Defaults to `.gitlab/auto-deploy-values.yaml`. |
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 22b36110695..e9398288ae3 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -18,6 +18,14 @@ then run `bin/rake gitlab:docs:compile_deprecations`.
 
 ## 15.0
 
+### Legacy database configuration
+
+The syntax of [GitLabs database](https://docs.gitlab.com/omnibus/settings/database.html)
+configuration located in `database.yml` is changing and the legacy format is deprecated. The legacy format
+supported using a single PostgreSQL adapter, whereas the new format is changing to support multiple databases. The `main:` database needs to be defined as a first configuration item.
+
+This deprecation mainly impacts users compiling GitLab from source because Omnibus will handle this configuration automatically.
+
 ### Audit events for repository push events
 
 Audit events for [repository events](../administration/audit_events.md#repository-push) are now deprecated and will be removed in GitLab 15.0.
diff --git a/doc/update/index.md b/doc/update/index.md
index 2d685af0875..60bfbb10df8 100644
--- a/doc/update/index.md
+++ b/doc/update/index.md
@@ -32,12 +32,12 @@ official ways to update GitLab:
 
 ### Linux packages (Omnibus GitLab)
 
-The [Omnibus update guide](https://docs.gitlab.com/omnibus/update/)
+The [package upgrade guide](package/index.md)
 contains the steps needed to update a package installed by official GitLab
 repositories.
 
 There are also instructions when you want to
-[update to a specific version](https://docs.gitlab.com/omnibus/update/#multi-step-upgrade-using-the-official-repositories).
+[update to a specific version](package/index.md#upgrade-to-a-specific-version-using-the-official-repositories).
 
 ### Installation from source
 
@@ -186,7 +186,7 @@ Find where your version sits in the upgrade path below, and upgrade GitLab
 accordingly, while also consulting the
 [version-specific upgrade instructions](#version-specific-upgrading-instructions):
 
-`8.11.Z` -> [`8.12.0`](#upgrades-from-versions-earlier-than-812) -> `8.17.7` -> `9.5.10` -> `10.8.7` -> [`11.11.8`](#1200) -> `12.0.12` -> [`12.1.17`](#1210) -> `12.10.14` -> `13.0.14` -> [`13.1.11`](#1310) -> [`13.8.8`](#1388) -> [latest `13.12.Z`](https://about.gitlab.com/releases/categories/releases/) -> [latest `14.0.Z`](#1400) -> [latest `14.Y.Z`](https://about.gitlab.com/releases/categories/releases/)
+`8.11.Z` -> `8.12.0` -> `8.17.7` -> `9.5.10` -> `10.8.7` -> [`11.11.8`](#1200) -> `12.0.12` -> [`12.1.17`](#1210) -> `12.10.14` -> `13.0.14` -> [`13.1.11`](#1310) -> [`13.8.8`](#1388) -> [latest `13.12.Z`](https://about.gitlab.com/releases/categories/releases/) -> [latest `14.0.Z`](#1400) -> [latest `14.Y.Z`](https://about.gitlab.com/releases/categories/releases/)
 
 The following table, while not exhaustive, shows some examples of the supported
 upgrade paths.
@@ -255,7 +255,7 @@ Edition, follow the guides below based on the installation method:
   to a version upgrade: stop the server, get the code, update configuration files for
   the new functionality, install libraries and do migrations, update the init
   script, start the application and check its status.
-- [Omnibus CE to EE](https://docs.gitlab.com/omnibus/update/README.html#update-community-edition-to-enterprise-edition) - Follow this guide to update your Omnibus
+- [Omnibus CE to EE](package/convert_to_ee.md) - Follow this guide to update your Omnibus
   GitLab Community Edition to the Enterprise Edition.
 
 ### Enterprise to Community Edition
@@ -286,7 +286,7 @@ These include:
 Apart from the instructions in this section, you should also check the
 installation-specific upgrade instructions, based on how you installed GitLab:
 
-- [Linux packages (Omnibus GitLab)](https://docs.gitlab.com/omnibus/update/README.html#version-specific-changes)
+- [Linux packages (Omnibus GitLab)](../update/package/index.md#version-specific-changes)
 - [Helm charts](https://docs.gitlab.com/charts/installation/upgrade.html)
 
 NOTE:
@@ -298,6 +298,24 @@ and [Helm Chart deployments](https://docs.gitlab.com/charts/). They come with ap
 Ruby 2.7.4 is required. Refer to [the Ruby installation instructions](../install/installation.md#2-ruby)
 for how to proceed.
 
+- GitLab 14.3.0 contains background migrations to [address Primary Key overflow risk for tables with an integer PK](https://gitlab.com/groups/gitlab-org/-/epics/4785) for the tables listed below:
+
+  - [`ci_builds.id`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/70245)
+  - [`ci_builds.stage_id`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66688)
+  - [`ci_builds_metadata`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/65692)
+  - [`taggings`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/66625)
+  - [`events`](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/64779)
+
+  If the migrations are executed as part of a no-downtime deployment, there's a risk of failure due to lock conflicts with the application logic, resulting in lock timeout or deadlocks. In each case, these migrations are safe to re-run until successful:
+
+  ```shell
+  # For Omnibus GitLab
+  sudo gitlab-rake db:migrate
+
+  # For source installations
+  sudo -u git -H bundle exec rake db:migrate RAILS_ENV=production
+  ```
+
 ### 14.2.0
 
 - Due to an issue where `BatchedBackgroundMigrationWorkers` were
@@ -478,7 +496,7 @@ The Rails upgrade included a change to CSRF token generation which is
 not backwards-compatible - GitLab servers with the new Rails version
 generate CSRF tokens that are not recognizable by GitLab servers
 with the older Rails version - which could cause non-GET requests to
-fail for [multi-node GitLab installations](https://docs.gitlab.com/omnibus/update/#multi-node--ha-deployment).
+fail for [multi-node GitLab installations](zero_downtime.md#multi-node--ha-deployment).
 
 So, if you are using multiple Rails servers and specifically upgrading from 13.0,
 all servers must first be upgraded to 13.1.Z before upgrading to 13.2.0 or later:
@@ -527,12 +545,6 @@ After upgraded to 11.11.8 you can safely upgrade to 12.0.Z.
 See our [documentation on upgrade paths](../policy/maintenance.md#upgrade-recommendations)
 for more information.
 
-### Upgrades from versions earlier than 8.12
-
-- `8.11.Z` and earlier: you might have to upgrade to `8.12.0` specifically before you can upgrade to `8.17.7`. This was [reported in an issue](https://gitlab.com/gitlab-org/gitlab/-/issues/207259).
-- [CI changes prior to version 8.0](https://docs.gitlab.com/omnibus/update/README.html#updating-gitlab-ci-from-prior-540-to-version-714-via-omnibus-gitlab)
-  when it was merged into GitLab.
-
 ## Miscellaneous
 
 - [MySQL to PostgreSQL](mysql_to_postgresql.md) guides you through migrating
diff --git a/doc/update/plan_your_upgrade.md b/doc/update/plan_your_upgrade.md
index d90516589e7..e10819c08eb 100644
--- a/doc/update/plan_your_upgrade.md
+++ b/doc/update/plan_your_upgrade.md
@@ -106,15 +106,15 @@ to your instance and then upgrade it for any relevant features you're using.
     - [Compiled from source](index.md#installation-from-source)
     - [Docker](index.md#installation-using-docker)
     - [Helm Charts](index.md#installation-using-helm)
-  - [Zero-downtime updates](https://docs.gitlab.com/omnibus/update/#zero-downtime-updates) ([if possible](index.md#upgrading-without-downtime) and desired)
-  - [Upgrade from GitLab Community Edition to Enterprise Edition, or vice-versa](https://docs.gitlab.com/omnibus/update/#upgrade-community-edition-to-enterprise-edition)
+  - [Zero-downtime upgrades](zero_downtime.md) (if possible and desired)
+  - [Convert from GitLab Community Edition to Enterprise Edition](package/convert_to_ee.md)
 - What version should you upgrade to:
   - [Determine what upgrade path](index.md#upgrade-paths) to follow.
   - Account for any [version-specific update instructions](index.md#version-specific-upgrading-instructions).
-  - Account for any [version-specific changes](https://docs.gitlab.com/omnibus/update/#version-specific-changes).
+  - Account for any [version-specific changes](package/index.md#version-specific-changes).
   - Check the [OS compatibility with the target GitLab version](https://docs.gitlab.com/omnibus/package-information/deprecated_os.html).
-- Due to [background migrations](https://docs.gitlab.com/omnibus/update/#background-migrations),
-  plan to pause any further upgrades after updating to a new major version.
+- Due to background migrations, plan to pause any further upgrades after upgrading
+  to a new major version.
   [All migrations must finish running](index.md#checking-for-background-migrations-before-upgrading)
   before the next upgrade.
 - If available in your starting version, consider
@@ -138,9 +138,8 @@ such as Geo, external Gitaly, or Elasticsearch.
 
 #### External Gitaly
 
-If you're using an external Gitaly server, read the
-[upgrade Gitaly](https://docs.gitlab.com/omnibus/update/#upgrade-gitaly-servers)
-documentation.
+If you're using an external Gitaly server, it must be upgraded to the newer
+version prior to upgrading the application server.
 
 #### Geo
 
diff --git a/lib/gitlab/bitbucket_server_import/importer.rb b/lib/gitlab/bitbucket_server_import/importer.rb
index 2c60b2e36cb..e0eee64dc58 100644
--- a/lib/gitlab/bitbucket_server_import/importer.rb
+++ b/lib/gitlab/bitbucket_server_import/importer.rb
@@ -56,7 +56,7 @@ module Gitlab
 
         log_info(stage: "complete")
 
-        Gitlab::Cache::Import::Caching.expire(already_imported_cache_key, 15.minutes.to_i)
+        Gitlab::Cache::Import::Caching.expire(already_imported_cache_key, Gitlab::Cache::Import::Caching::SHORTER_TIMEOUT)
         true
       end
 
diff --git a/lib/gitlab/cache/import/caching.rb b/lib/gitlab/cache/import/caching.rb
index 8cc4f213fc1..947efee43a9 100644
--- a/lib/gitlab/cache/import/caching.rb
+++ b/lib/gitlab/cache/import/caching.rb
@@ -9,6 +9,8 @@ module Gitlab
 
         LONGER_TIMEOUT = 72.hours.to_i
 
+        SHORTER_TIMEOUT = 15.minutes.to_i
+
         WRITE_IF_GREATER_SCRIPT = <<-EOF.strip_heredoc.freeze
         local key, value, ttl = KEYS[1], tonumber(ARGV[1]), ARGV[2]
         local existing = tonumber(redis.call("get", key))
diff --git a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
index cf99d722e4d..5efa557d7eb 100644
--- a/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Build.gitlab-ci.yml
@@ -1,6 +1,9 @@
+variables:
+  AUTO_BUILD_IMAGE_VERSION: 'v1.0.0'
+
 build:
   stage: build
-  image: 'registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v1.0.0'
+  image: 'registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:${AUTO_BUILD_IMAGE_VERSION}'
   variables:
     DOCKER_TLS_CERTDIR: ''
   services:
diff --git a/lib/gitlab/ci/templates/Jobs/Build.latest.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Build.latest.gitlab-ci.yml
index cbbd3320d2f..6a3b0cfa9e7 100644
--- a/lib/gitlab/ci/templates/Jobs/Build.latest.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Build.latest.gitlab-ci.yml
@@ -2,9 +2,12 @@
 #          It is not meant to be used with `include:`.
 #          This template is scheduled for removal when testing is complete: https://gitlab.com/gitlab-org/gitlab/-/issues/337987
 
+variables:
+  AUTO_BUILD_IMAGE_VERSION: 'v1.3.1'
+
 build:
   stage: build
-  image: 'registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:v1.3.1'
+  image: 'registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image:${AUTO_BUILD_IMAGE_VERSION}'
   variables:
     DOCKER_TLS_CERTDIR: ''
   services:
diff --git a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
index 208951fa1a1..e0627b85aba 100644
--- a/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
@@ -1,5 +1,8 @@
+variables:
+  DAST_AUTO_DEPLOY_IMAGE_VERSION: 'v2.12.0'
+
 .dast-auto-deploy:
-  image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v2.12.0"
+  image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${DAST_AUTO_DEPLOY_IMAGE_VERSION}"
 
 dast_environment_deploy:
   extends: .dast-auto-deploy
diff --git a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
index 72b986099aa..2df985cfbb5 100644
--- a/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
@@ -1,5 +1,8 @@
+variables:
+  AUTO_DEPLOY_IMAGE_VERSION: 'v2.12.0'
+
 .auto-deploy:
-  image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v2.12.0"
+  image: "registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:${AUTO_DEPLOY_IMAGE_VERSION}"
   dependencies: []
 
 review:
diff --git a/lib/gitlab/email/message/in_product_marketing/team.rb b/lib/gitlab/email/message/in_product_marketing/team.rb
index cf723ad5efd..6a0471ef9c5 100644
--- a/lib/gitlab/email/message/in_product_marketing/team.rb
+++ b/lib/gitlab/email/message/in_product_marketing/team.rb
@@ -23,7 +23,7 @@ module Gitlab
 
           def title
             [
-              s_('InProductMarketing|Team work makes the dream work'),
+              s_('InProductMarketing|Team work makes the dream work'),
               s_('InProductMarketing|*GitLab*, noun: a synonym for efficient teams'),
               s_('InProductMarketing|Find out how your teams are really doing')
             ][series]
diff --git a/lib/gitlab/github_import/parallel_scheduling.rb b/lib/gitlab/github_import/parallel_scheduling.rb
index 8c76f5a9d94..4d0074e43d7 100644
--- a/lib/gitlab/github_import/parallel_scheduling.rb
+++ b/lib/gitlab/github_import/parallel_scheduling.rb
@@ -44,7 +44,7 @@ module Gitlab
         # still scheduling duplicates while. Since all work has already been
         # completed those jobs will just cycle through any remaining pages while
         # not scheduling anything.
-        Gitlab::Cache::Import::Caching.expire(already_imported_cache_key, 15.minutes.to_i)
+        Gitlab::Cache::Import::Caching.expire(already_imported_cache_key, Gitlab::Cache::Import::Caching::SHORTER_TIMEOUT)
         info(project.id, message: "importer finished")
 
         retval
diff --git a/lib/gitlab/github_import/user_finder.rb b/lib/gitlab/github_import/user_finder.rb
index f583ef39d13..93483ee697a 100644
--- a/lib/gitlab/github_import/user_finder.rb
+++ b/lib/gitlab/github_import/user_finder.rb
@@ -106,7 +106,7 @@ module Gitlab
 
         unless email
           user = client.user(username)
-          email = Gitlab::Cache::Import::Caching.write(cache_key, user.email) if user
+          email = Gitlab::Cache::Import::Caching.write(cache_key, user.email, timeout: timeout(user.email)) if user
         end
 
         email
@@ -171,6 +171,16 @@ module Gitlab
         # which we couldn't find an ID.
         [exists, number > 0 ? number : nil]
       end
+
+      private
+
+      def timeout(email)
+        if email
+          Gitlab::Cache::Import::Caching::TIMEOUT
+        else
+          Gitlab::Cache::Import::Caching::SHORTER_TIMEOUT
+        end
+      end
     end
   end
 end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index f3d89f0d39d..9fe1eb7a262 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -17195,9 +17195,6 @@ msgstr ""
 msgid "Improves Git cloning performance."
 msgstr ""
 
-msgid "In %{time_to_now}"
-msgstr ""
-
 msgid "In case of pull mirroring, your user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches."
 msgstr ""
 
@@ -17522,7 +17519,7 @@ msgstr ""
 msgid "InProductMarketing|Team up in GitLab for greater efficiency"
 msgstr ""
 
-msgid "InProductMarketing|Team work makes the dream work"
+msgid "InProductMarketing|Team work makes the dream work"
 msgstr ""
 
 msgid "InProductMarketing|Test, create, deploy"
@@ -25306,9 +25303,6 @@ msgstr ""
 msgid "Please set a new password before proceeding."
 msgstr ""
 
-msgid "Please set up a Service Desk email address in order to add a custom suffix. %{linkStart}Learn more%{linkEnd}."
-msgstr ""
-
 msgid "Please share your feedback about %{featureName} %{linkStart}in this issue%{linkEnd} to help us improve the experience."
 msgstr ""
 
@@ -35160,6 +35154,9 @@ msgstr ""
 msgid "To access this domain create a new DNS record"
 msgstr ""
 
+msgid "To add a custom suffix, set up a Service Desk email address. %{linkStart}Learn more.%{linkEnd}"
+msgstr ""
+
 msgid "To add an SSH key you need to %{generate_link_start}generate one%{link_end} or use an %{existing_link_start}existing key%{link_end}."
 msgstr ""
 
@@ -38758,6 +38755,9 @@ msgstr ""
 msgid "You must provide your current password in order to change it."
 msgstr ""
 
+msgid "You must sign in to search for specific projects."
+msgstr ""
+
 msgid "You must sign in to search for specific terms."
 msgstr ""
 
@@ -39934,9 +39934,18 @@ msgstr ""
 msgid "in"
 msgstr ""
 
+msgid "in all GitLab"
+msgstr ""
+
+msgid "in group"
+msgstr ""
+
 msgid "in group %{link_to_group}"
 msgstr ""
 
+msgid "in project"
+msgstr ""
+
 msgid "in project %{link_to_project}"
 msgstr ""
 
@@ -40356,6 +40365,9 @@ msgstr ""
 msgid "mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure, or check the %{linkStart}troubleshooting documentation%{linkEnd} to see other possible actions."
 msgstr ""
 
+msgid "mrWidget|The pipeline for this merge request did not complete. Push a new commit to fix the failure."
+msgstr ""
+
 msgid "mrWidget|The source branch has been deleted"
 msgstr ""
 
@@ -40398,6 +40410,9 @@ msgstr ""
 msgid "mrWidget|You can merge after removing denied licenses"
 msgstr ""
 
+msgid "mrWidget|You can only merge once this merge request is approved."
+msgstr ""
+
 msgid "mrWidget|Your password"
 msgstr ""
 
diff --git a/spec/controllers/explore/projects_controller_spec.rb b/spec/controllers/explore/projects_controller_spec.rb
index a2b62aa49d2..02ed954508e 100644
--- a/spec/controllers/explore/projects_controller_spec.rb
+++ b/spec/controllers/explore/projects_controller_spec.rb
@@ -200,6 +200,24 @@ RSpec.describe Explore::ProjectsController do
         let(:sorting_param) { 'created_asc' }
       end
     end
+
+    describe 'GET #index' do
+      let(:controller_action) { :index }
+      let(:params_with_name) { { name: 'some project' } }
+
+      context 'when disable_anonymous_search is enabled' do
+        before do
+          stub_feature_flags(disable_anonymous_search: true)
+        end
+
+        it 'does not show a flash message' do
+          sign_in(create(:user))
+          get controller_action, params: params_with_name
+
+          expect(flash[:notice]).to be_nil
+        end
+      end
+    end
   end
 
   context 'when user is not signed in' do
@@ -229,5 +247,50 @@ RSpec.describe Explore::ProjectsController do
         expect(response).to redirect_to new_user_session_path
       end
     end
+
+    describe 'GET #index' do
+      let(:controller_action) { :index }
+      let(:params_with_name) { { name: 'some project' } }
+
+      context 'when disable_anonymous_search is enabled' do
+        before do
+          stub_feature_flags(disable_anonymous_search: true)
+        end
+
+        it 'shows a flash message' do
+          get controller_action, params: params_with_name
+
+          expect(flash[:notice]).to eq('You must sign in to search for specific projects.')
+        end
+
+        context 'when search param is not given' do
+          it 'does not show a flash message' do
+            get controller_action
+
+            expect(flash[:notice]).to be_nil
+          end
+        end
+
+        context 'when format is not HTML' do
+          it 'does not show a flash message' do
+            get controller_action, params: params_with_name.merge(format: :atom)
+
+            expect(flash[:notice]).to be_nil
+          end
+        end
+      end
+
+      context 'when disable_anonymous_search is disabled' do
+        before do
+          stub_feature_flags(disable_anonymous_search: false)
+        end
+
+        it 'does not show a flash message' do
+          get controller_action, params: params_with_name
+
+          expect(flash[:notice]).to be_nil
+        end
+      end
+    end
   end
 end
diff --git a/spec/features/admin/admin_users_impersonation_tokens_spec.rb b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
index 7466150addf..0966032ff37 100644
--- a/spec/features/admin/admin_users_impersonation_tokens_spec.rb
+++ b/spec/features/admin/admin_users_impersonation_tokens_spec.rb
@@ -42,7 +42,7 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
       click_on "Create impersonation token"
 
       expect(active_impersonation_tokens).to have_text(name)
-      expect(active_impersonation_tokens).to have_text('In')
+      expect(active_impersonation_tokens).to have_text('in')
       expect(active_impersonation_tokens).to have_text('api')
       expect(active_impersonation_tokens).to have_text('read_user')
       expect(PersonalAccessTokensFinder.new(impersonation: true).execute.count).to equal(1)
@@ -59,6 +59,14 @@ RSpec.describe 'Admin > Users > Impersonation Tokens', :js do
 
       expect(active_impersonation_tokens).to have_text(impersonation_token.name)
       expect(active_impersonation_tokens).not_to have_text(personal_access_token.name)
+      expect(active_impersonation_tokens).to have_text('in')
+    end
+
+    it 'shows absolute times' do
+      admin.update!(time_display_relative: false)
+      visit admin_user_impersonation_tokens_path(user_id: user.username)
+
+      expect(active_impersonation_tokens).to have_text(personal_access_token.expires_at.strftime('%b %d'))
     end
   end
 
diff --git a/spec/features/groups/settings/repository_spec.rb b/spec/features/groups/settings/repository_spec.rb
index 7082b2b20bd..d95eaf3c92c 100644
--- a/spec/features/groups/settings/repository_spec.rb
+++ b/spec/features/groups/settings/repository_spec.rb
@@ -18,11 +18,11 @@ RSpec.describe 'Group Repository settings' do
 
     before do
       stub_container_registry_config(enabled: true)
-      visit group_settings_repository_path(group)
     end
 
     it_behaves_like 'a deploy token in settings' do
       let(:entity_type) { 'group' }
+      let(:page_path) { group_settings_repository_path(group) }
     end
   end
 
diff --git a/spec/features/issues/issue_sidebar_spec.rb b/spec/features/issues/issue_sidebar_spec.rb
index e198d9d4ebb..bd4be755a92 100644
--- a/spec/features/issues/issue_sidebar_spec.rb
+++ b/spec/features/issues/issue_sidebar_spec.rb
@@ -117,7 +117,7 @@ RSpec.describe 'Issue Sidebar' do
 
             page.within '.dropdown-menu-user' do
               expect(page).to have_link('Invite members')
-              expect(page).to have_selector('[data-track-event="click_invite_members"]')
+              expect(page).to have_selector('[data-track-action="click_invite_members"]')
               expect(page).to have_selector('[data-track-label="edit_assignee"]')
             end
 
diff --git a/spec/features/merge_request/user_edits_reviewers_sidebar_spec.rb b/spec/features/merge_request/user_edits_reviewers_sidebar_spec.rb
index 45ee914de9d..caf0c609f64 100644
--- a/spec/features/merge_request/user_edits_reviewers_sidebar_spec.rb
+++ b/spec/features/merge_request/user_edits_reviewers_sidebar_spec.rb
@@ -26,7 +26,7 @@ RSpec.describe 'Merge request > User edits reviewers sidebar', :js do
 
         page.within '.dropdown-menu-user' do
           expect(page).to have_link('Invite Members')
-          expect(page).to have_selector('[data-track-event="click_invite_members"]')
+          expect(page).to have_selector('[data-track-action="click_invite_members"]')
           expect(page).to have_selector('[data-track-label="edit_reviewer"]')
         end
 
diff --git a/spec/features/profiles/personal_access_tokens_spec.rb b/spec/features/profiles/personal_access_tokens_spec.rb
index de511e99182..8025db9f86d 100644
--- a/spec/features/profiles/personal_access_tokens_spec.rb
+++ b/spec/features/profiles/personal_access_tokens_spec.rb
@@ -56,7 +56,7 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do
       click_on "Create personal access token"
 
       expect(active_personal_access_tokens).to have_text(name)
-      expect(active_personal_access_tokens).to have_text('In')
+      expect(active_personal_access_tokens).to have_text('in')
       expect(active_personal_access_tokens).to have_text('api')
       expect(active_personal_access_tokens).to have_text('read_user')
       expect(created_personal_access_token).not_to be_empty
@@ -85,6 +85,18 @@ RSpec.describe 'Profile > Personal Access Tokens', :js do
       expect(active_personal_access_tokens).to have_text(personal_access_token.name)
       expect(active_personal_access_tokens).not_to have_text(impersonation_token.name)
     end
+
+    context 'when User#time_display_relative is false' do
+      before do
+        user.update!(time_display_relative: false)
+      end
+
+      it 'shows absolute times for expires_at' do
+        visit profile_personal_access_tokens_path
+
+        expect(active_personal_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %d'))
+      end
+    end
   end
 
   describe "inactive tokens" do
diff --git a/spec/features/projects/settings/access_tokens_spec.rb b/spec/features/projects/settings/access_tokens_spec.rb
index 33e2623522e..deeab084c5f 100644
--- a/spec/features/projects/settings/access_tokens_spec.rb
+++ b/spec/features/projects/settings/access_tokens_spec.rb
@@ -65,7 +65,7 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
       click_on 'Create project access token'
 
       expect(active_project_access_tokens).to have_text(name)
-      expect(active_project_access_tokens).to have_text('In')
+      expect(active_project_access_tokens).to have_text('in')
       expect(active_project_access_tokens).to have_text('api')
       expect(active_project_access_tokens).to have_text('read_api')
       expect(active_project_access_tokens).to have_text('Maintainer')
@@ -156,6 +156,18 @@ RSpec.describe 'Project > Settings > Access Tokens', :js do
 
       expect(active_project_access_tokens).to have_text(project_access_token.name)
     end
+
+    context 'when User#time_display_relative is false' do
+      before do
+        user.update!(time_display_relative: false)
+      end
+
+      it 'shows absolute times for expires_at' do
+        visit project_settings_access_tokens_path(project)
+
+        expect(active_project_access_tokens).to have_text(PersonalAccessToken.last.expires_at.strftime('%b %d'))
+      end
+    end
   end
 
   describe 'inactive tokens' do
diff --git a/spec/features/projects/settings/repository_settings_spec.rb b/spec/features/projects/settings/repository_settings_spec.rb
index f420a8a76b9..4e1b55d3d70 100644
--- a/spec/features/projects/settings/repository_settings_spec.rb
+++ b/spec/features/projects/settings/repository_settings_spec.rb
@@ -31,11 +31,11 @@ RSpec.describe 'Projects > Settings > Repository settings' do
       before do
         stub_container_registry_config(enabled: true)
         stub_feature_flags(ajax_new_deploy_token: project)
-        visit project_settings_repository_path(project)
       end
 
       it_behaves_like 'a deploy token in settings' do
         let(:entity_type) { 'project' }
+        let(:page_path) { project_settings_repository_path(project) }
       end
     end
 
diff --git a/spec/finders/projects_finder_spec.rb b/spec/finders/projects_finder_spec.rb
index 1fdc05ca2d2..de244856e12 100644
--- a/spec/finders/projects_finder_spec.rb
+++ b/spec/finders/projects_finder_spec.rb
@@ -190,6 +190,32 @@ RSpec.describe ProjectsFinder do
         it { is_expected.to eq([public_project]) }
       end
 
+      context 'with anonymous user' do
+        let(:public_project_2) { create(:project, :public, group: group, name: 'E', path: 'E') }
+        let(:current_user) { nil }
+        let(:params) { { search: 'C' } }
+
+        context 'with disable_anonymous_search feature flag enabled' do
+          before do
+            stub_feature_flags(disable_anonymous_search: true)
+          end
+
+          it 'does not perform search' do
+            is_expected.to eq([public_project_2, public_project])
+          end
+        end
+
+        context 'with disable_anonymous_search feature flag disabled' do
+          before do
+            stub_feature_flags(disable_anonymous_search: false)
+          end
+
+          it 'finds one public project' do
+            is_expected.to eq([public_project])
+          end
+        end
+      end
+
       describe 'filter by name for backward compatibility' do
         let(:params) { { name: 'C' } }
 
diff --git a/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js b/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js
index b77def195b6..2dcc537809f 100644
--- a/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js
+++ b/spec/frontend/authentication/two_factor_auth/components/recovery_codes_spec.js
@@ -78,7 +78,7 @@ describe('RecoveryCodes', () => {
 
     it('fires Snowplow event', () => {
       expect(findProceedButton().attributes()).toMatchObject({
-        'data-track-event': 'click_button',
+        'data-track-action': 'click_button',
         'data-track-label': '2fa_recovery_codes_proceed_button',
       });
     });
diff --git a/spec/frontend/deprecated_jquery_dropdown_spec.js b/spec/frontend/deprecated_jquery_dropdown_spec.js
index 7858f88f8c3..4a6dee31cd5 100644
--- a/spec/frontend/deprecated_jquery_dropdown_spec.js
+++ b/spec/frontend/deprecated_jquery_dropdown_spec.js
@@ -323,7 +323,7 @@ describe('deprecatedJQueryDropdown', () => {
         const li = dropdown.renderItem(item, null, 3);
         const link = li.querySelector('a');
 
-        expect(link).toHaveAttr('data-track-event', 'click_text');
+        expect(link).toHaveAttr('data-track-action', 'click_text');
         expect(link).toHaveAttr('data-track-label', 'some_value_for_label');
         expect(link).toHaveAttr('data-track-value', '3');
         expect(link).toHaveAttr('data-track-property', 'suggestion-category');
diff --git a/spec/frontend/design_management/components/design_notes/__snapshots__/design_reply_form_spec.js.snap b/spec/frontend/design_management/components/design_notes/__snapshots__/design_reply_form_spec.js.snap
index d9f5ba0bade..4dc8eaea174 100644
--- a/spec/frontend/design_management/components/design_notes/__snapshots__/design_reply_form_spec.js.snap
+++ b/spec/frontend/design_management/components/design_notes/__snapshots__/design_reply_form_spec.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`Design reply form component renders button text as "Comment" when creating a comment 1`] = `
-"<button data-track-event=\\"click_button\\" data-qa-selector=\\"save_comment_button\\" type=\\"submit\\" disabled=\\"disabled\\" class=\\"btn gl-mr-3 gl-w-auto! btn-confirm btn-md disabled gl-button\\">
+"<button data-track-action=\\"click_button\\" data-qa-selector=\\"save_comment_button\\" type=\\"submit\\" disabled=\\"disabled\\" class=\\"btn gl-mr-3 gl-w-auto! btn-confirm btn-md disabled gl-button\\">
   <!---->
   <!----> <span class=\\"gl-button-text\\">
       Comment
@@ -9,7 +9,7 @@ exports[`Design reply form component renders button text as "Comment" when creat
 `;
 
 exports[`Design reply form component renders button text as "Save comment" when creating a comment 1`] = `
-"<button data-track-event=\\"click_button\\" data-qa-selector=\\"save_comment_button\\" type=\\"submit\\" disabled=\\"disabled\\" class=\\"btn gl-mr-3 gl-w-auto! btn-confirm btn-md disabled gl-button\\">
+"<button data-track-action=\\"click_button\\" data-qa-selector=\\"save_comment_button\\" type=\\"submit\\" disabled=\\"disabled\\" class=\\"btn gl-mr-3 gl-w-auto! btn-confirm btn-md disabled gl-button\\">
   <!---->
   <!----> <span class=\\"gl-button-text\\">
       Save comment
diff --git a/spec/frontend/header_search/components/app_spec.js b/spec/frontend/header_search/components/app_spec.js
index 523d3bd7b23..2cbcb73ce5b 100644
--- a/spec/frontend/header_search/components/app_spec.js
+++ b/spec/frontend/header_search/components/app_spec.js
@@ -1,14 +1,41 @@
 import { GlSearchBoxByType } from '@gitlab/ui';
+import Vue from 'vue';
+import Vuex from 'vuex';
 import { shallowMountExtended } from 'helpers/vue_test_utils_helper';
 import HeaderSearchApp from '~/header_search/components/app.vue';
-import { ESC_KEY } from '~/lib/utils/keys';
-import { MOCK_USERNAME } from '../mock_data';
+import HeaderSearchDefaultItems from '~/header_search/components/header_search_default_items.vue';
+import HeaderSearchScopedItems from '~/header_search/components/header_search_scoped_items.vue';
+import { ENTER_KEY, ESC_KEY } from '~/lib/utils/keys';
+import { visitUrl } from '~/lib/utils/url_utility';
+import { MOCK_SEARCH, MOCK_SEARCH_QUERY, MOCK_USERNAME } from '../mock_data';
+
+Vue.use(Vuex);
+
+jest.mock('~/lib/utils/url_utility', () => ({
+  visitUrl: jest.fn(),
+}));
 
 describe('HeaderSearchApp', () => {
   let wrapper;
 
-  const createComponent = () => {
-    wrapper = shallowMountExtended(HeaderSearchApp);
+  const actionSpies = {
+    setSearch: jest.fn(),
+  };
+
+  const createComponent = (initialState) => {
+    const store = new Vuex.Store({
+      state: {
+        ...initialState,
+      },
+      actions: actionSpies,
+      getters: {
+        searchQuery: () => MOCK_SEARCH_QUERY,
+      },
+    });
+
+    wrapper = shallowMountExtended(HeaderSearchApp, {
+      store,
+    });
   };
 
   afterEach(() => {
@@ -17,6 +44,8 @@ describe('HeaderSearchApp', () => {
 
   const findHeaderSearchInput = () => wrapper.findComponent(GlSearchBoxByType);
   const findHeaderSearchDropdown = () => wrapper.findByTestId('header-search-dropdown-menu');
+  const findHeaderSearchDefaultItems = () => wrapper.findComponent(HeaderSearchDefaultItems);
+  const findHeaderSearchScopedItems = () => wrapper.findComponent(HeaderSearchScopedItems);
 
   describe('template', () => {
     it('always renders Header Search Input', () => {
@@ -43,6 +72,29 @@ describe('HeaderSearchApp', () => {
         });
       });
     });
+
+    describe.each`
+      search         | showDefault | showScoped
+      ${null}        | ${true}     | ${false}
+      ${''}          | ${true}     | ${false}
+      ${MOCK_SEARCH} | ${false}    | ${true}
+    `('Header Search Dropdown Items', ({ search, showDefault, showScoped }) => {
+      describe(`when search is ${search}`, () => {
+        beforeEach(() => {
+          createComponent({ search });
+          window.gon.current_username = MOCK_USERNAME;
+          wrapper.setData({ showDropdown: true });
+        });
+
+        it(`should${showDefault ? '' : ' not'} render the Default Dropdown Items`, () => {
+          expect(findHeaderSearchDefaultItems().exists()).toBe(showDefault);
+        });
+
+        it(`should${showScoped ? '' : ' not'} render the Scoped Dropdown Items`, () => {
+          expect(findHeaderSearchScopedItems().exists()).toBe(showScoped);
+        });
+      });
+    });
   });
 
   describe('events', () => {
@@ -86,6 +138,22 @@ describe('HeaderSearchApp', () => {
           expect(findHeaderSearchDropdown().exists()).toBe(false);
         });
       });
+
+      it('calls setSearch when search input event is fired', async () => {
+        findHeaderSearchInput().vm.$emit('input', MOCK_SEARCH);
+
+        await wrapper.vm.$nextTick();
+
+        expect(actionSpies.setSearch).toHaveBeenCalledWith(expect.any(Object), MOCK_SEARCH);
+      });
+
+      it('submits a search onKey-Enter', async () => {
+        findHeaderSearchInput().vm.$emit('keydown', new KeyboardEvent({ key: ENTER_KEY }));
+
+        await wrapper.vm.$nextTick();
+
+        expect(visitUrl).toHaveBeenCalledWith(MOCK_SEARCH_QUERY);
+      });
     });
   });
 });
diff --git a/spec/frontend/header_search/components/header_search_scoped_items_spec.js b/spec/frontend/header_search/components/header_search_scoped_items_spec.js
new file mode 100644
index 00000000000..f0e5e182ec4
--- /dev/null
+++ b/spec/frontend/header_search/components/header_search_scoped_items_spec.js
@@ -0,0 +1,61 @@
+import { GlDropdownItem } from '@gitlab/ui';
+import { shallowMount } from '@vue/test-utils';
+import Vue from 'vue';
+import Vuex from 'vuex';
+import { trimText } from 'helpers/text_helper';
+import HeaderSearchScopedItems from '~/header_search/components/header_search_scoped_items.vue';
+import { MOCK_SEARCH, MOCK_SCOPED_SEARCH_OPTIONS } from '../mock_data';
+
+Vue.use(Vuex);
+
+describe('HeaderSearchScopedItems', () => {
+  let wrapper;
+
+  const createComponent = (initialState) => {
+    const store = new Vuex.Store({
+      state: {
+        search: MOCK_SEARCH,
+        ...initialState,
+      },
+      getters: {
+        scopedSearchOptions: () => MOCK_SCOPED_SEARCH_OPTIONS,
+      },
+    });
+
+    wrapper = shallowMount(HeaderSearchScopedItems, {
+      store,
+    });
+  };
+
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  const findDropdownItems = () => wrapper.findAllComponents(GlDropdownItem);
+  const findDropdownItemTitles = () => findDropdownItems().wrappers.map((w) => trimText(w.text()));
+  const findDropdownItemLinks = () => findDropdownItems().wrappers.map((w) => w.attributes('href'));
+
+  describe('template', () => {
+    describe('Dropdown items', () => {
+      beforeEach(() => {
+        createComponent();
+      });
+
+      it('renders item for each option in scopedSearchOptions', () => {
+        expect(findDropdownItems()).toHaveLength(MOCK_SCOPED_SEARCH_OPTIONS.length);
+      });
+
+      it('renders titles correctly', () => {
+        const expectedTitles = MOCK_SCOPED_SEARCH_OPTIONS.map((o) =>
+          trimText(`"${MOCK_SEARCH}" ${o.description} ${o.scope || ''}`),
+        );
+        expect(findDropdownItemTitles()).toStrictEqual(expectedTitles);
+      });
+
+      it('renders links correctly', () => {
+        const expectedLinks = MOCK_SCOPED_SEARCH_OPTIONS.map((o) => o.url);
+        expect(findDropdownItemLinks()).toStrictEqual(expectedLinks);
+      });
+    });
+  });
+});
diff --git a/spec/frontend/header_search/mock_data.js b/spec/frontend/header_search/mock_data.js
index 680b6522d98..5963ad9c279 100644
--- a/spec/frontend/header_search/mock_data.js
+++ b/spec/frontend/header_search/mock_data.js
@@ -4,14 +4,37 @@ import {
   MSG_MR_ASSIGNED_TO_ME,
   MSG_MR_IM_REVIEWER,
   MSG_MR_IVE_CREATED,
+  MSG_IN_PROJECT,
+  MSG_IN_GROUP,
+  MSG_IN_ALL_GITLAB,
 } from '~/header_search/constants';
 
 export const MOCK_USERNAME = 'anyone';
 
+export const MOCK_SEARCH_PATH = '/search';
+
 export const MOCK_ISSUE_PATH = '/dashboard/issues';
 
 export const MOCK_MR_PATH = '/dashboard/merge_requests';
 
+export const MOCK_ALL_PATH = '/';
+
+export const MOCK_PROJECT = {
+  id: 123,
+  name: 'MockProject',
+  path: '/mock-project',
+};
+
+export const MOCK_GROUP = {
+  id: 321,
+  name: 'MockGroup',
+  path: '/mock-group',
+};
+
+export const MOCK_SEARCH_QUERY = 'http://gitlab.com/search?search=test';
+
+export const MOCK_SEARCH = 'test';
+
 export const MOCK_SEARCH_CONTEXT = {
   project: null,
   project_metadata: {},
@@ -41,3 +64,20 @@ export const MOCK_DEFAULT_SEARCH_OPTIONS = [
     url: `${MOCK_MR_PATH}/?author_username=${MOCK_USERNAME}`,
   },
 ];
+
+export const MOCK_SCOPED_SEARCH_OPTIONS = [
+  {
+    scope: MOCK_PROJECT.name,
+    description: MSG_IN_PROJECT,
+    url: MOCK_PROJECT.path,
+  },
+  {
+    scope: MOCK_GROUP.name,
+    description: MSG_IN_GROUP,
+    url: MOCK_GROUP.path,
+  },
+  {
+    description: MSG_IN_ALL_GITLAB,
+    url: MOCK_ALL_PATH,
+  },
+];
diff --git a/spec/frontend/header_search/store/actions_spec.js b/spec/frontend/header_search/store/actions_spec.js
new file mode 100644
index 00000000000..4530df0d91c
--- /dev/null
+++ b/spec/frontend/header_search/store/actions_spec.js
@@ -0,0 +1,28 @@
+import testAction from 'helpers/vuex_action_helper';
+import * as actions from '~/header_search/store/actions';
+import * as types from '~/header_search/store/mutation_types';
+import createState from '~/header_search/store/state';
+import { MOCK_SEARCH } from '../mock_data';
+
+describe('Header Search Store Actions', () => {
+  let state;
+
+  beforeEach(() => {
+    state = createState({});
+  });
+
+  afterEach(() => {
+    state = null;
+  });
+
+  describe('setSearch', () => {
+    it('calls the SET_SEARCH mutation', () => {
+      return testAction({
+        action: actions.setSearch,
+        payload: MOCK_SEARCH,
+        state,
+        expectedMutations: [{ type: types.SET_SEARCH, payload: MOCK_SEARCH }],
+      });
+    });
+  });
+});
diff --git a/spec/frontend/header_search/store/getters_spec.js b/spec/frontend/header_search/store/getters_spec.js
index f87a58a0560..2ad0a082f6a 100644
--- a/spec/frontend/header_search/store/getters_spec.js
+++ b/spec/frontend/header_search/store/getters_spec.js
@@ -2,10 +2,16 @@ import * as getters from '~/header_search/store/getters';
 import initState from '~/header_search/store/state';
 import {
   MOCK_USERNAME,
+  MOCK_SEARCH_PATH,
   MOCK_ISSUE_PATH,
   MOCK_MR_PATH,
   MOCK_SEARCH_CONTEXT,
   MOCK_DEFAULT_SEARCH_OPTIONS,
+  MOCK_SCOPED_SEARCH_OPTIONS,
+  MOCK_PROJECT,
+  MOCK_GROUP,
+  MOCK_ALL_PATH,
+  MOCK_SEARCH,
 } from '../mock_data';
 
 describe('Header Search Store Getters', () => {
@@ -13,6 +19,7 @@ describe('Header Search Store Getters', () => {
 
   const createState = (initialState) => {
     state = initState({
+      searchPath: MOCK_SEARCH_PATH,
       issuesPath: MOCK_ISSUE_PATH,
       mrPath: MOCK_MR_PATH,
       searchContext: MOCK_SEARCH_CONTEXT,
@@ -25,6 +32,30 @@ describe('Header Search Store Getters', () => {
   });
 
   describe.each`
+    group         | project         | expectedPath
+    ${null}       | ${null}         | ${`${MOCK_SEARCH_PATH}?search=${MOCK_SEARCH}&nav_source=navbar&project_id=undefined&group_id=undefined&scope=issues`}
+    ${MOCK_GROUP} | ${null}         | ${`${MOCK_SEARCH_PATH}?search=${MOCK_SEARCH}&nav_source=navbar&project_id=undefined&group_id=${MOCK_GROUP.id}&scope=issues`}
+    ${MOCK_GROUP} | ${MOCK_PROJECT} | ${`${MOCK_SEARCH_PATH}?search=${MOCK_SEARCH}&nav_source=navbar&project_id=${MOCK_PROJECT.id}&group_id=${MOCK_GROUP.id}&scope=issues`}
+  `('searchQuery', ({ group, project, expectedPath }) => {
+    describe(`when group is ${group?.name} and project is ${project?.name}`, () => {
+      beforeEach(() => {
+        createState({
+          searchContext: {
+            group,
+            project,
+            scope: 'issues',
+          },
+        });
+        state.search = MOCK_SEARCH;
+      });
+
+      it(`should return ${expectedPath}`, () => {
+        expect(getters.searchQuery(state)).toBe(expectedPath);
+      });
+    });
+  });
+
+  describe.each`
     group                     | group_metadata                   | project                     | project_metadata                   | expectedPath
     ${null}                   | ${null}                          | ${null}                     | ${null}                            | ${MOCK_ISSUE_PATH}
     ${{ name: 'Test Group' }} | ${{ issues_path: 'group/path' }} | ${null}                     | ${null}                            | ${'group/path'}
@@ -72,6 +103,71 @@ describe('Header Search Store Getters', () => {
     });
   });
 
+  describe.each`
+    group         | project         | expectedPath
+    ${null}       | ${null}         | ${null}
+    ${MOCK_GROUP} | ${null}         | ${null}
+    ${MOCK_GROUP} | ${MOCK_PROJECT} | ${`${MOCK_SEARCH_PATH}?search=${MOCK_SEARCH}&nav_source=navbar&project_id=${MOCK_PROJECT.id}&group_id=${MOCK_GROUP.id}&scope=issues`}
+  `('projectUrl', ({ group, project, expectedPath }) => {
+    describe(`when group is ${group?.name} and project is ${project?.name}`, () => {
+      beforeEach(() => {
+        createState({
+          searchContext: {
+            group,
+            project,
+            scope: 'issues',
+          },
+        });
+        state.search = MOCK_SEARCH;
+      });
+
+      it(`should return ${expectedPath}`, () => {
+        expect(getters.projectUrl(state)).toBe(expectedPath);
+      });
+    });
+  });
+
+  describe.each`
+    group         | project         | expectedPath
+    ${null}       | ${null}         | ${null}
+    ${MOCK_GROUP} | ${null}         | ${`${MOCK_SEARCH_PATH}?search=${MOCK_SEARCH}&nav_source=navbar&group_id=${MOCK_GROUP.id}&scope=issues`}
+    ${MOCK_GROUP} | ${MOCK_PROJECT} | ${`${MOCK_SEARCH_PATH}?search=${MOCK_SEARCH}&nav_source=navbar&group_id=${MOCK_GROUP.id}&scope=issues`}
+  `('groupUrl', ({ group, project, expectedPath }) => {
+    describe(`when group is ${group?.name} and project is ${project?.name}`, () => {
+      beforeEach(() => {
+        createState({
+          searchContext: {
+            group,
+            project,
+            scope: 'issues',
+          },
+        });
+        state.search = MOCK_SEARCH;
+      });
+
+      it(`should return ${expectedPath}`, () => {
+        expect(getters.groupUrl(state)).toBe(expectedPath);
+      });
+    });
+  });
+
+  describe('allUrl', () => {
+    const expectedPath = `${MOCK_SEARCH_PATH}?search=${MOCK_SEARCH}&nav_source=navbar&scope=issues`;
+
+    beforeEach(() => {
+      createState({
+        searchContext: {
+          scope: 'issues',
+        },
+      });
+      state.search = MOCK_SEARCH;
+    });
+
+    it(`should return ${expectedPath}`, () => {
+      expect(getters.allUrl(state)).toBe(expectedPath);
+    });
+  });
+
   describe('defaultSearchOptions', () => {
     const mockGetters = {
       scopedIssuesPath: MOCK_ISSUE_PATH,
@@ -89,4 +185,27 @@ describe('Header Search Store Getters', () => {
       );
     });
   });
+
+  describe('scopedSearchOptions', () => {
+    const mockGetters = {
+      projectUrl: MOCK_PROJECT.path,
+      groupUrl: MOCK_GROUP.path,
+      allUrl: MOCK_ALL_PATH,
+    };
+
+    beforeEach(() => {
+      createState({
+        searchContext: {
+          project: MOCK_PROJECT,
+          group: MOCK_GROUP,
+        },
+      });
+    });
+
+    it('returns the correct array', () => {
+      expect(getters.scopedSearchOptions(state, mockGetters)).toStrictEqual(
+        MOCK_SCOPED_SEARCH_OPTIONS,
+      );
+    });
+  });
 });
diff --git a/spec/frontend/header_search/store/mutations_spec.js b/spec/frontend/header_search/store/mutations_spec.js
new file mode 100644
index 00000000000..8196c06099d
--- /dev/null
+++ b/spec/frontend/header_search/store/mutations_spec.js
@@ -0,0 +1,20 @@
+import * as types from '~/header_search/store/mutation_types';
+import mutations from '~/header_search/store/mutations';
+import createState from '~/header_search/store/state';
+import { MOCK_SEARCH } from '../mock_data';
+
+describe('Header Search Store Mutations', () => {
+  let state;
+
+  beforeEach(() => {
+    state = createState({});
+  });
+
+  describe('SET_SEARCH', () => {
+    it('sets search to value', () => {
+      mutations[types.SET_SEARCH](state, MOCK_SEARCH);
+
+      expect(state.search).toBe(MOCK_SEARCH);
+    });
+  });
+});
diff --git a/spec/frontend/header_spec.js b/spec/frontend/header_spec.js
index 4ca6d7259bd..0d43accb7e5 100644
--- a/spec/frontend/header_spec.js
+++ b/spec/frontend/header_spec.js
@@ -59,8 +59,8 @@ describe('Header', () => {
     beforeEach(() => {
       setFixtures(`
       <li class="js-nav-user-dropdown">
-        <a class="js-buy-pipeline-minutes-link" data-track-event="click_buy_ci_minutes" data-track-label="free" data-track-property="user_dropdown">Buy Pipeline minutes</a>
-        <a class="js-upgrade-plan-link" data-track-event="click_upgrade_link" data-track-label="free" data-track-property="user_dropdown">Upgrade</a>
+        <a class="js-buy-pipeline-minutes-link" data-track-action="click_buy_ci_minutes" data-track-label="free" data-track-property="user_dropdown">Buy Pipeline minutes</a>
+        <a class="js-upgrade-plan-link" data-track-action="click_upgrade_link" data-track-label="free" data-track-property="user_dropdown">Upgrade</a>
       </li>`);
 
       trackingSpy = mockTracking('_category_', $('.js-nav-user-dropdown').element, jest.spyOn);
diff --git a/spec/frontend/invite_members/components/invite_members_trigger_spec.js b/spec/frontend/invite_members/components/invite_members_trigger_spec.js
index f57af61ad5b..b2ebb9e4a47 100644
--- a/spec/frontend/invite_members/components/invite_members_trigger_spec.js
+++ b/spec/frontend/invite_members/components/invite_members_trigger_spec.js
@@ -79,14 +79,14 @@ describe.each(['button', 'anchor'])('with triggerElement as %s', (triggerElement
     it('does not add tracking attributes', () => {
       createComponent();
 
-      expect(findButton().attributes('data-track-event')).toBeUndefined();
+      expect(findButton().attributes('data-track-action')).toBeUndefined();
       expect(findButton().attributes('data-track-label')).toBeUndefined();
     });
 
     it('adds tracking attributes', () => {
       createComponent({ label: '_label_', event: '_event_' });
 
-      expect(findButton().attributes('data-track-event')).toBe('_event_');
+      expect(findButton().attributes('data-track-action')).toBe('_event_');
       expect(findButton().attributes('data-track-label')).toBe('_label_');
     });
   });
diff --git a/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js b/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js
index 63c1260560b..f84800d8266 100644
--- a/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js
+++ b/spec/frontend/pages/dashboard/projects/index/components/customize_homepage_banner_spec.js
@@ -65,7 +65,7 @@ describe('CustomizeHomepageBanner', () => {
       await wrapper.vm.$nextTick();
       const button = wrapper.find(`[href='${wrapper.vm.preferencesBehaviorPath}']`);
 
-      expect(button.attributes('data-track-event')).toEqual(preferencesTrackingEvent);
+      expect(button.attributes('data-track-action')).toEqual(preferencesTrackingEvent);
       expect(button.attributes('data-track-label')).toEqual(provide.trackLabel);
     });
 
diff --git a/spec/frontend/sidebar/track_invite_members_spec.js b/spec/frontend/sidebar/track_invite_members_spec.js
index 6c96e4cfc76..5946e3320c4 100644
--- a/spec/frontend/sidebar/track_invite_members_spec.js
+++ b/spec/frontend/sidebar/track_invite_members_spec.js
@@ -10,7 +10,7 @@ describe('Track user dropdown open', () => {
     document.body.innerHTML = `
       <div id="dummy-wrapper-element">
         <div class="js-sidebar-assignee-dropdown">
-          <div class="js-invite-members-track" data-track-event="_track_event_" data-track-label="_track_label_">
+          <div class="js-invite-members-track" data-track-action="_track_event_" data-track-label="_track_label_">
           </div>
         </div>
       </div>
diff --git a/spec/frontend/vue_mr_widget/components/states/merge_checks_failed_spec.js b/spec/frontend/vue_mr_widget/components/states/merge_checks_failed_spec.js
new file mode 100644
index 00000000000..bdad0bada5f
--- /dev/null
+++ b/spec/frontend/vue_mr_widget/components/states/merge_checks_failed_spec.js
@@ -0,0 +1,49 @@
+import { shallowMount } from '@vue/test-utils';
+import MergeChecksFailed from '~/vue_merge_request_widget/components/states/merge_checks_failed.vue';
+
+let wrapper;
+
+function factory(propsData = {}) {
+  wrapper = shallowMount(MergeChecksFailed, {
+    propsData,
+  });
+}
+
+describe('Merge request widget merge checks failed state component', () => {
+  afterEach(() => {
+    wrapper.destroy();
+  });
+
+  it.each`
+    mrState                                   | displayText
+    ${{ isPipelineFailed: true }}             | ${'pipelineFailed'}
+    ${{ approvals: true, isApproved: false }} | ${'approvalNeeded'}
+    ${{ hasMergeableDiscussionsState: true }} | ${'unresolvedDiscussions'}
+  `('display $displayText text for $mrState', ({ mrState, displayText }) => {
+    factory({ mr: mrState });
+
+    expect(wrapper.text()).toContain(MergeChecksFailed.i18n[displayText]);
+  });
+
+  describe('unresolved discussions', () => {
+    it('renders jump to button', () => {
+      factory({ mr: { hasMergeableDiscussionsState: true } });
+
+      expect(wrapper.find('[data-testid="jumpToUnresolved"]').exists()).toBe(true);
+    });
+
+    it('renders resolve thread button', () => {
+      factory({
+        mr: {
+          hasMergeableDiscussionsState: true,
+          createIssueToResolveDiscussionsPath: 'https://gitlab.com',
+        },
+      });
+
+      expect(wrapper.find('[data-testid="resolveIssue"]').exists()).toBe(true);
+      expect(wrapper.find('[data-testid="resolveIssue"]').attributes('href')).toBe(
+        'https://gitlab.com',
+      );
+    });
+  });
+});
diff --git a/spec/helpers/nav/new_dropdown_helper_spec.rb b/spec/helpers/nav/new_dropdown_helper_spec.rb
index 79b49be92a5..64f4d5ff797 100644
--- a/spec/helpers/nav/new_dropdown_helper_spec.rb
+++ b/spec/helpers/nav/new_dropdown_helper_spec.rb
@@ -51,7 +51,7 @@ RSpec.describe Nav::NewDropdownHelper do
               title: 'Invite members',
               href: expected_href,
               data: {
-                track_event: 'click_link',
+                track_action: 'click_link',
                 track_label: 'test_tracking_label',
                 track_property: :invite_members_new_dropdown
               }
@@ -104,7 +104,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'general_new_project',
                 title: 'New project/repository',
                 href: '/projects/new',
-                data: { track_event: 'click_link_new_project', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_project_link' }
+                data: { track_action: 'click_link_new_project', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_project_link' }
               )
             )
           )
@@ -122,7 +122,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'general_new_group',
                 title: 'New group',
                 href: '/groups/new',
-                data: { track_event: 'click_link_new_group', track_label: 'plus_menu_dropdown' }
+                data: { track_action: 'click_link_new_group', track_label: 'plus_menu_dropdown' }
               )
             )
           )
@@ -140,7 +140,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'general_new_snippet',
                 title: 'New snippet',
                 href: '/-/snippets/new',
-                data: { track_event: 'click_link_new_snippet_parent', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_snippet_link' }
+                data: { track_action: 'click_link_new_snippet_parent', track_label: 'plus_menu_dropdown', qa_selector: 'global_new_snippet_link' }
               )
             )
           )
@@ -178,7 +178,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_project',
                 title: 'New project/repository',
                 href: "/projects/new?namespace_id=#{group.id}",
-                data: { track_event: 'click_link_new_project_group', track_label: 'plus_menu_dropdown' }
+                data: { track_action: 'click_link_new_project_group', track_label: 'plus_menu_dropdown' }
               )
             )
           )
@@ -196,7 +196,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_subgroup',
                 title: 'New subgroup',
                 href: "/groups/new?parent_id=#{group.id}",
-                data: { track_event: 'click_link_new_subgroup', track_label: 'plus_menu_dropdown' }
+                data: { track_action: 'click_link_new_subgroup', track_label: 'plus_menu_dropdown' }
               )
             )
           )
@@ -245,7 +245,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_issue',
                 title: 'New issue',
                 href: "/#{project.path_with_namespace}/-/issues/new",
-                data: { track_event: 'click_link_new_issue', track_label: 'plus_menu_dropdown', qa_selector: 'new_issue_link' }
+                data: { track_action: 'click_link_new_issue', track_label: 'plus_menu_dropdown', qa_selector: 'new_issue_link' }
               )
             )
           )
@@ -263,7 +263,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_mr',
                 title: 'New merge request',
                 href: "/#{merge_project.path_with_namespace}/-/merge_requests/new",
-                data: { track_event: 'click_link_new_mr', track_label: 'plus_menu_dropdown' }
+                data: { track_action: 'click_link_new_mr', track_label: 'plus_menu_dropdown' }
               )
             )
           )
@@ -281,7 +281,7 @@ RSpec.describe Nav::NewDropdownHelper do
                 id: 'new_snippet',
                 title: 'New snippet',
                 href: "/#{project.path_with_namespace}/-/snippets/new",
-                data: { track_event: 'click_link_new_snippet_project', track_label: 'plus_menu_dropdown' }
+                data: { track_action: 'click_link_new_snippet_project', track_label: 'plus_menu_dropdown' }
               )
             )
           )
diff --git a/spec/helpers/nav/top_nav_helper_spec.rb b/spec/helpers/nav/top_nav_helper_spec.rb
index 4d6da258536..da7e5d5dce2 100644
--- a/spec/helpers/nav/top_nav_helper_spec.rb
+++ b/spec/helpers/nav/top_nav_helper_spec.rb
@@ -142,7 +142,7 @@ RSpec.describe Nav::TopNavHelper do
           expected_primary = ::Gitlab::Nav::TopNavMenuItem.build(
             css_class: 'qa-projects-dropdown',
             data: {
-              track_event: 'click_dropdown',
+              track_action: 'click_dropdown',
               track_label: 'projects_dropdown'
             },
             icon: 'project',
@@ -248,7 +248,7 @@ RSpec.describe Nav::TopNavHelper do
           expected_primary = ::Gitlab::Nav::TopNavMenuItem.build(
             css_class: 'qa-groups-dropdown',
             data: {
-              track_event: 'click_dropdown',
+              track_action: 'click_dropdown',
               track_label: 'groups_dropdown'
             },
             icon: 'group',
diff --git a/spec/lib/gitlab/github_import/user_finder_spec.rb b/spec/lib/gitlab/github_import/user_finder_spec.rb
index f81fa3b1e2e..8eb6eedd72d 100644
--- a/spec/lib/gitlab/github_import/user_finder_spec.rb
+++ b/spec/lib/gitlab/github_import/user_finder_spec.rb
@@ -195,7 +195,7 @@ RSpec.describe Gitlab::GithubImport::UserFinder, :clean_gitlab_redis_cache do
 
         expect(Gitlab::Cache::Import::Caching)
           .to receive(:write)
-          .with(an_instance_of(String), email)
+          .with(an_instance_of(String), email, timeout: Gitlab::Cache::Import::Caching::TIMEOUT)
 
         finder.email_for_github_username('kittens')
       end
@@ -211,6 +211,16 @@ RSpec.describe Gitlab::GithubImport::UserFinder, :clean_gitlab_redis_cache do
 
         expect(finder.email_for_github_username('kittens')).to be_nil
       end
+
+      it 'shortens the timeout for Email address in cache when an Email address is private/nil from GitHub' do
+        user = double(:user, email: nil)
+        expect(client).to receive(:user).with('kittens').and_return(user)
+
+        expect(Gitlab::Cache::Import::Caching)
+          .to receive(:write).with(an_instance_of(String), nil, timeout: Gitlab::Cache::Import::Caching::SHORTER_TIMEOUT)
+
+        expect(finder.email_for_github_username('kittens')).to be_nil
+      end
     end
   end
 
diff --git a/spec/support/shared_contexts/services/service_ping/stubbed_service_ping_metrics_definitions_shared_context.rb b/spec/support/shared_contexts/services/service_ping/stubbed_service_ping_metrics_definitions_shared_context.rb
index 6b49a415889..2b810e790f0 100644
--- a/spec/support/shared_contexts/services/service_ping/stubbed_service_ping_metrics_definitions_shared_context.rb
+++ b/spec/support/shared_contexts/services/service_ping/stubbed_service_ping_metrics_definitions_shared_context.rb
@@ -6,21 +6,25 @@ RSpec.shared_context 'stubbed service ping metrics definitions' do
   let(:metrics_definitions) { standard_metrics + subscription_metrics + operational_metrics + optional_metrics }
   let(:standard_metrics) do
     [
-      metric_attributes('uuid', "standard")
+      metric_attributes('uuid', 'standard'),
+      metric_attributes('recorded_at', 'standard'),
+      metric_attributes('settings.collected_data_categories', 'standard', 'object')
     ]
   end
 
   let(:operational_metrics) do
     [
-      metric_attributes('counts.merge_requests', "operational"),
+      metric_attributes('counts.merge_requests', 'operational'),
       metric_attributes('counts.todos', "operational")
     ]
   end
 
   let(:optional_metrics) do
     [
-      metric_attributes('counts.boards', "optional"),
-      metric_attributes('gitaly.filesystems', '').except('data_category')
+      metric_attributes('counts.boards', 'optional', 'number'),
+      metric_attributes('gitaly.filesystems', '').except('data_category'),
+      metric_attributes('usage_activity_by_stage.monitor.projects_with_enabled_alert_integrations_histogram', 'optional', 'object'),
+      metric_attributes('topology', 'optional', 'object')
     ]
   end
 
@@ -34,10 +38,11 @@ RSpec.shared_context 'stubbed service ping metrics definitions' do
     )
   end
 
-  def metric_attributes(key_path, category)
+  def metric_attributes(key_path, category, value_type = 'string')
     {
       'key_path' => key_path,
-      'data_category' => category
+      'data_category' => category,
+      'value_type' => value_type
     }
   end
 end
diff --git a/spec/support/shared_examples/features/deploy_token_shared_examples.rb b/spec/support/shared_examples/features/deploy_token_shared_examples.rb
index fd77297a490..e70f9b52c09 100644
--- a/spec/support/shared_examples/features/deploy_token_shared_examples.rb
+++ b/spec/support/shared_examples/features/deploy_token_shared_examples.rb
@@ -1,15 +1,22 @@
 # frozen_string_literal: true
 
 RSpec.shared_examples 'a deploy token in settings' do
-  it 'view deploy tokens' do
+  it 'view deploy tokens', :js do
+    user.update!(time_display_relative: true)
+
+    visit page_path
+
     within('.deploy-tokens') do
       expect(page).to have_content(deploy_token.name)
       expect(page).to have_content('read_repository')
       expect(page).to have_content('read_registry')
+      expect(page).to have_content('in 4 days')
     end
   end
 
   it 'add a new deploy token' do
+    visit page_path
+
     fill_in 'deploy_token_name', with: 'new_deploy_key'
     fill_in 'deploy_token_expires_at', with: (Date.today + 1.month).to_s
     fill_in 'deploy_token_username', with: 'deployer'
@@ -24,4 +31,18 @@ RSpec.shared_examples 'a deploy token in settings' do
       expect(page).to have_selector("input[name='deploy-token'][readonly='readonly']")
     end
   end
+
+  context 'when User#time_display_relative is false', :js do
+    before do
+      user.update!(time_display_relative: false)
+    end
+
+    it 'shows absolute times for expires_at' do
+      visit page_path
+
+      within('.deploy-tokens') do
+        expect(page).to have_content(deploy_token.expires_at.strftime('%b %d'))
+      end
+    end
+  end
 end
diff --git a/spec/support/shared_examples/features/discussion_comments_shared_example.rb b/spec/support/shared_examples/features/discussion_comments_shared_example.rb
index fb2e422559d..99004e8283c 100644
--- a/spec/support/shared_examples/features/discussion_comments_shared_example.rb
+++ b/spec/support/shared_examples/features/discussion_comments_shared_example.rb
@@ -197,6 +197,8 @@ RSpec.shared_examples 'thread comments for issue, epic and merge request' do |re
 
     find(submit_button_selector).click
 
+    wait_for_all_requests
+
     expect(page).to have_content(comment)
 
     new_comment = all(comments_selector).last
diff --git a/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb b/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb
index c0cfc27ceaf..149486320ae 100644
--- a/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb
+++ b/spec/support/shared_examples/features/issuable_invite_members_shared_examples.rb
@@ -15,7 +15,7 @@ RSpec.shared_examples 'issuable invite members' do
 
       page.within '.dropdown-menu-user' do
         expect(page).to have_link('Invite Members')
-        expect(page).to have_selector('[data-track-event="click_invite_members"]')
+        expect(page).to have_selector('[data-track-action="click_invite_members"]')
         expect(page).to have_selector('[data-track-label="edit_assignee"]')
       end
 
diff --git a/spec/views/projects/empty.html.haml_spec.rb b/spec/views/projects/empty.html.haml_spec.rb
index 70da4fc9e27..416dfc10174 100644
--- a/spec/views/projects/empty.html.haml_spec.rb
+++ b/spec/views/projects/empty.html.haml_spec.rb
@@ -53,7 +53,7 @@ RSpec.describe 'projects/empty' do
     it 'shows invite members info', :aggregate_failures do
       render
 
-      expect(rendered).to have_selector('[data-track-event=render]')
+      expect(rendered).to have_selector('[data-track-action=render]')
       expect(rendered).to have_selector('[data-track-label=invite_members_empty_project]')
       expect(rendered).to have_content('Invite your team')
       expect(rendered).to have_content('Add members to this project and start collaborating with your team.')
diff --git a/spec/views/search/_results.html.haml_spec.rb b/spec/views/search/_results.html.haml_spec.rb
index ecfcf74edc1..dcf1f46b46c 100644
--- a/spec/views/search/_results.html.haml_spec.rb
+++ b/spec/views/search/_results.html.haml_spec.rb
@@ -74,7 +74,7 @@ RSpec.describe 'search/_results' do
           it 'renders the click text event tracking attributes' do
             render
 
-            expect(rendered).to have_selector('[data-track-event=click_text]')
+            expect(rendered).to have_selector('[data-track-action=click_text]')
             expect(rendered).to have_selector('[data-track-property=search_result]')
           end
         end
@@ -83,7 +83,7 @@ RSpec.describe 'search/_results' do
           it 'does not render the click text event tracking attributes' do
             render
 
-            expect(rendered).not_to have_selector('[data-track-event=click_text]')
+            expect(rendered).not_to have_selector('[data-track-action=click_text]')
             expect(rendered).not_to have_selector('[data-track-property=search_result]')
           end
         end
@@ -105,7 +105,7 @@ RSpec.describe 'search/_results' do
           it 'renders the click text event tracking attributes' do
             render
 
-            expect(rendered).to have_selector('[data-track-event=click_text]')
+            expect(rendered).to have_selector('[data-track-action=click_text]')
             expect(rendered).to have_selector('[data-track-property=search_result]')
           end
         end
@@ -114,7 +114,7 @@ RSpec.describe 'search/_results' do
           it 'does not render the click text event tracking attributes' do
             render
 
-            expect(rendered).not_to have_selector('[data-track-event=click_text]')
+            expect(rendered).not_to have_selector('[data-track-action=click_text]')
             expect(rendered).not_to have_selector('[data-track-property=search_result]')
           end
         end
diff --git a/spec/views/shared/access_tokens/_table.html.haml_spec.rb b/spec/views/shared/access_tokens/_table.html.haml_spec.rb
index 489675b5683..0a23768b4f1 100644
--- a/spec/views/shared/access_tokens/_table.html.haml_spec.rb
+++ b/spec/views/shared/access_tokens/_table.html.haml_spec.rb
@@ -19,7 +19,6 @@ RSpec.describe 'shared/access_tokens/_table.html.haml' do
 
     allow(view).to receive(:personal_access_token_expiration_enforced?).and_return(token_expiry_enforced?)
     allow(view).to receive(:show_profile_token_expiry_notification?).and_return(true)
-    allow(view).to receive(:distance_of_time_in_words_to_now).and_return('4 days')
 
     if project
       project.add_maintainer(user)
@@ -140,7 +139,6 @@ RSpec.describe 'shared/access_tokens/_table.html.haml' do
 
       # Expiry
       expect(rendered).to have_content 'Expired', count: 2
-      expect(rendered).to have_content 'In 4 days'
 
       # Revoke buttons
       expect(rendered).to have_link 'Revoke', href: 'path/', class: 'btn-danger-secondary', count: 1