From 000087abd5a11442a7e34b0e5f3bf86cb40fa8e4 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 16 Jul 2020 06:09:33 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 app/assets/javascripts/awards_handler.js      |   5 -
 .../batch_comments/components/draft_note.vue  |   7 +-
 .../diffs/components/diff_line_note_form.vue  |   5 +-
 .../components/inline_diff_table_row.vue      |  10 +-
 .../diffs/components/inline_diff_view.vue     |  14 +-
 .../components/parallel_diff_table_row.vue    |   7 +
 .../diffs/components/parallel_diff_view.vue   |  14 +-
 .../fragments/user.fragment.graphql           |   7 +
 .../notes/components/discussion_notes.vue     |   8 +-
 .../components/multiline_comment_form.vue     |  16 ++
 .../components/multiline_comment_utils.js     |  19 ++
 .../notes/components/noteable_note.vue        |   6 +-
 .../javascripts/notes/stores/actions.js       |   8 +
 .../javascripts/notes/stores/modules/index.js |   9 +
 .../notes/stores/mutation_types.js            |   2 +
 .../javascripts/notes/stores/mutations.js     |   8 +
 .../repository/components/table/index.vue     |   1 +
 .../repository/components/table/row.vue       |   6 +
 .../vue_shared/components/file_icon.vue       |  24 +-
 .../javascripts/vue_shared/constants.js       |   2 +
 .../components/design_management/design.scss  |   5 +-
 app/graphql/resolvers/issues_resolver.rb      |   2 +
 app/graphql/types/issue_connection_type.rb    |  13 +
 app/graphql/types/issue_type.rb               |   2 +
 .../issuable/_bulk_update_sidebar.html.haml   |   2 +-
 .../design-management-transitions.yml         |   5 +
 .../jdb-highlight-commented-rows.yml          |   5 +
 changelogs/unreleased/symlink-icon-ui.yml     |   5 +
 doc/.vale/gitlab/AlertBoxStyle.yml            |   5 +-
 doc/administration/auth/jwt.md                |   3 +-
 .../auth/ldap/google_secure_ldap.md           |   3 +-
 .../auth/ldap/ldap-troubleshooting.md         |   4 +-
 .../disaster_recovery/bring_primary_back.md   |   6 +-
 .../geo/replication/database.md               |   6 +-
 .../geo/replication/datatypes.md              |   2 +-
 .../geo/replication/external_database.md      |   3 +-
 .../geo/replication/multiple_servers.md       |   9 +-
 .../geo/replication/troubleshooting.md        |   7 +-
 .../geo/replication/updating_the_geo_nodes.md |   3 +-
 doc/administration/gitaly/praefect.md         |  18 +-
 .../high_availability/consul.md               |   4 +-
 .../high_availability/gitlab.md               |  18 +-
 doc/administration/high_availability/nfs.md   |   9 +-
 .../high_availability/sidekiq.md              |   3 +-
 doc/administration/instance_limits.md         |  15 +-
 doc/administration/integration/plantuml.md    |   3 +-
 doc/administration/integration/terminal.md    |   3 +-
 doc/administration/job_artifacts.md           |  13 +-
 doc/administration/job_logs.md                |   2 +-
 doc/administration/lfs/index.md               |   3 +-
 doc/administration/logs.md                    |   3 +-
 doc/administration/merge_request_diffs.md     |   3 +-
 doc/administration/object_storage.md          |  15 +-
 .../operations/fast_ssh_key_lookup.md         |  12 +-
 .../operations/filesystem_benchmarking.md     |   3 +-
 .../packages/container_registry.md            |   6 +-
 .../packages/dependency_proxy.md              |   3 +-
 doc/administration/packages/index.md          |   3 +-
 .../postgresql/replication_and_failover.md    |   9 +-
 doc/administration/postgresql/standalone.md   |   3 +-
 doc/administration/raketasks/ldap.md          |   2 +-
 doc/administration/raketasks/maintenance.md   |   2 +-
 .../redis/replication_and_failover.md         |   3 +-
 .../reference_architectures/2k_users.md       |   3 +-
 .../reference_architectures/3k_users.md       |   3 +-
 .../reference_architectures/index.md          |   3 +-
 .../repository_storage_paths.md               |   3 +-
 doc/administration/smime_signing_email.md     |   9 +-
 .../gitlab_rails_cheat_sheet.md               |   4 +-
 .../troubleshooting/linux_cheat_sheet.md      |   2 +-
 .../navigating_gitlab_via_rails_console.md    |   2 +-
 .../troubleshooting/postgresql.md             |   6 +-
 doc/administration/troubleshooting/sidekiq.md |   3 +-
 doc/administration/uploads.md                 |   3 +-
 doc/api/epics.md                              |   2 +-
 doc/api/feature_flag_specs.md                 |   2 +-
 doc/api/feature_flags_legacy.md               |   2 +-
 .../graphql/reference/gitlab_schema.graphql   |  25 ++
 doc/api/graphql/reference/gitlab_schema.json  |  78 +++++
 doc/api/group_labels.md                       |   6 +-
 doc/api/issues.md                             |   2 +-
 doc/api/labels.md                             |   9 +-
 doc/api/merge_requests.md                     |   2 +-
 doc/api/namespaces.md                         |   3 +-
 doc/api/packages.md                           |   4 +-
 doc/api/projects.md                           |   9 +-
 doc/api/users.md                              |   6 +-
 doc/ci/docker/using_docker_images.md          |   9 +-
 doc/ci/environments/index.md                  |   2 +-
 .../index.md                                  |   4 +-
 doc/ci/interactive_web_terminal/index.md      |   6 +-
 doc/ci/pipelines/job_artifacts.md             |   2 +-
 doc/ci/yaml/README.md                         |   7 +-
 doc/development/api_graphql_styleguide.md     |   3 +-
 doc/development/application_limits.md         |  12 +-
 doc/development/chatops_on_gitlabcom.md       |   3 +-
 doc/development/cicd/index.md                 |   6 +-
 .../add_foreign_key_to_existing_column.md     |   3 +-
 doc/development/database_review.md            |   3 +-
 .../site_architecture/global_nav.md           |   4 +-
 .../documentation/site_architecture/index.md  |   2 +-
 doc/development/geo/framework.md              |   6 +-
 doc/development/gitaly.md                     |   3 +-
 doc/development/i18n/externalization.md       |   3 +-
 doc/development/import_export.md              |   3 +-
 doc/development/import_project.md             |   3 +-
 doc/development/migration_style_guide.md      |   3 +-
 doc/development/packages.md                   |   3 +-
 doc/development/performance.md                |   3 +-
 doc/development/profiling.md                  |   3 +-
 doc/development/sidekiq_style_guide.md        |   3 +-
 .../testing_guide/best_practices.md           |   3 +-
 .../end_to_end/environment_selection.md       |   9 +-
 .../end_to_end/rspec_metadata_tests.md        |   2 +-
 doc/development/what_requires_downtime.md     |   3 +-
 doc/install/aws/index.md                      |  15 +-
 doc/install/openshift_and_gitlab/index.md     |   3 +-
 doc/install/requirements.md                   |  12 +-
 doc/integration/elasticsearch.md              |   9 +-
 doc/policy/maintenance.md                     |   3 +-
 doc/raketasks/backup_restore.md               |   3 +-
 doc/security/rack_attack.md                   |   6 +-
 doc/topics/autodevops/customize.md            |   4 +-
 doc/topics/autodevops/stages.md               |   8 +-
 doc/topics/autodevops/upgrading_postgresql.md |   9 +-
 doc/update/README.md                          |   6 +-
 doc/update/upgrading_from_ce_to_ee.md         |   3 +-
 .../configuration/index.md                    |   3 +-
 doc/user/application_security/dast/index.md   |  17 +-
 doc/user/application_security/sast/index.md   |   3 +-
 .../secret_detection/index.md                 |   3 +-
 doc/user/group/index.md                       |   2 +-
 doc/user/group/saml_sso/index.md              |   3 +-
 doc/user/group/saml_sso/scim_setup.md         |   6 +-
 doc/user/markdown.md                          |  18 +-
 doc/user/packages/npm_registry/index.md       |   3 +-
 doc/user/profile/account/delete_account.md    |   3 +-
 .../project/clusters/add_remove_clusters.md   |   3 +-
 doc/user/project/clusters/index.md            |   5 +-
 .../prometheus_library/nginx_ingress.md       |   3 +-
 .../prometheus_library/nginx_ingress_vts.md   |   3 +-
 .../project/issues/crosslinking_issues.md     |   3 +-
 doc/user/project/issues/csv_import.md         |   3 +-
 doc/user/project/labels.md                    |   2 +-
 .../repository/x509_signed_commits/index.md   |   6 +-
 doc/user/project/web_ide/index.md             |   6 +-
 locale/gitlab.pot                             |  19 ++
 .../non_devops/performance_bar_spec.rb        |   2 +-
 qa/qa/specs/helpers/quarantine.rb             |  32 ++-
 qa/spec/specs/helpers/quarantine_spec.rb      |  33 ++-
 spec/frontend/awards_handler_spec.js          | 269 +++++++-----------
 .../blob_header_filepath_spec.js.snap         |   1 +
 .../components/inline_diff_table_row_spec.js  |  53 ++--
 .../parallel_diff_table_row_spec.js           |  28 +-
 .../helpers/fake_request_animation_frame.js   |  13 +
 .../multiline_comment_utils_spec.js           |  27 ++
 .../notes/components/noteable_note_spec.js    |   1 +
 spec/frontend/notes/stores/actions_spec.js    |  13 +
 spec/frontend/notes/stores/mutation_spec.js   |  20 ++
 .../table/__snapshots__/row_spec.js.snap      |  55 ++++
 .../repository/components/table/index_spec.js |  15 +-
 .../repository/components/table/row_spec.js   |  16 ++
 .../vue_shared/components/file_icon_spec.js   |  27 +-
 .../types/issue_connection_type_spec.rb       |  11 +
 spec/graphql/types/issue_type_spec.rb         |  98 +++++++
 ...rpolation_format_in_common_metrics_spec.rb |  11 +-
 166 files changed, 1201 insertions(+), 452 deletions(-)
 create mode 100644 app/assets/javascripts/graphql_shared/fragments/user.fragment.graphql
 create mode 100644 app/graphql/types/issue_connection_type.rb
 create mode 100644 changelogs/unreleased/design-management-transitions.yml
 create mode 100644 changelogs/unreleased/jdb-highlight-commented-rows.yml
 create mode 100644 changelogs/unreleased/symlink-icon-ui.yml
 create mode 100644 spec/frontend/helpers/fake_request_animation_frame.js
 create mode 100644 spec/graphql/types/issue_connection_type_spec.rb

diff --git a/app/assets/javascripts/awards_handler.js b/app/assets/javascripts/awards_handler.js
index 217577de7cb..0e83ba3d528 100644
--- a/app/assets/javascripts/awards_handler.js
+++ b/app/assets/javascripts/awards_handler.js
@@ -13,11 +13,6 @@ import * as Emoji from '~/emoji';
 
 const animationEndEventString = 'animationend webkitAnimationEnd MSAnimationEnd oAnimationEnd';
 const transitionEndEventString = 'transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd';
-const requestAnimationFrame =
-  window.requestAnimationFrame ||
-  window.webkitRequestAnimationFrame ||
-  window.mozRequestAnimationFrame ||
-  window.setTimeout;
 
 const FROM_SENTENCE_REGEX = /(?:, and | and |, )/; // For separating lists produced by ruby's Array#toSentence
 
diff --git a/app/assets/javascripts/batch_comments/components/draft_note.vue b/app/assets/javascripts/batch_comments/components/draft_note.vue
index db5516b7b93..4c100ec7335 100644
--- a/app/assets/javascripts/batch_comments/components/draft_note.vue
+++ b/app/assets/javascripts/batch_comments/components/draft_note.vue
@@ -51,6 +51,7 @@ export default {
       'scrollToDraft',
       'toggleResolveDiscussion',
     ]),
+    ...mapActions(['setSelectedCommentPositionHover']),
     update(data) {
       this.updateDraft(data);
     },
@@ -67,7 +68,11 @@ export default {
 };
 </script>
 <template>
-  <article class="draft-note-component note-wrapper">
+  <article
+    class="draft-note-component note-wrapper"
+    @mouseenter="setSelectedCommentPositionHover(draft.position.line_range)"
+    @mouseleave="setSelectedCommentPositionHover()"
+  >
     <ul class="notes draft-notes">
       <noteable-note
         :note="draft"
diff --git a/app/assets/javascripts/diffs/components/diff_line_note_form.vue b/app/assets/javascripts/diffs/components/diff_line_note_form.vue
index 9558bfb04c6..d2f49bd0020 100644
--- a/app/assets/javascripts/diffs/components/diff_line_note_form.vue
+++ b/app/assets/javascripts/diffs/components/diff_line_note_form.vue
@@ -148,10 +148,7 @@ export default {
 
 <template>
   <div class="content discussion-form discussion-form-container discussion-notes">
-    <div
-      v-if="glFeatures.multilineComments"
-      class="gl-mb-3 gl-text-gray-700 gl-border-gray-100 gl-border-b-solid gl-border-b-1 gl-pb-3"
-    >
+    <div v-if="glFeatures.multilineComments" class="gl-mb-3 gl-text-gray-700 gl-pb-3">
       <multiline-comment-form
         v-model="commentLineStart"
         :line="line"
diff --git a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
index 4e228577666..168e8c6c14e 100644
--- a/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_table_row.vue
@@ -37,6 +37,11 @@ export default {
       required: false,
       default: false,
     },
+    isCommented: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -47,7 +52,10 @@ export default {
     ...mapGetters('diffs', ['fileLineCoverage']),
     ...mapState({
       isHighlighted(state) {
-        return this.line.line_code !== null && this.line.line_code === state.diffs.highlightedRow;
+        if (this.isCommented) return true;
+
+        const lineCode = this.line.line_code;
+        return lineCode ? lineCode === state.diffs.highlightedRow : false;
       },
     }),
     isContextLine() {
diff --git a/app/assets/javascripts/diffs/components/inline_diff_view.vue b/app/assets/javascripts/diffs/components/inline_diff_view.vue
index babf48f41f3..e82d06ee385 100644
--- a/app/assets/javascripts/diffs/components/inline_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/inline_diff_view.vue
@@ -1,10 +1,11 @@
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
 import draftCommentsMixin from '~/diffs/mixins/draft_comments';
 import InlineDraftCommentRow from '~/batch_comments/components/inline_draft_comment_row.vue';
 import inlineDiffTableRow from './inline_diff_table_row.vue';
 import inlineDiffCommentRow from './inline_diff_comment_row.vue';
 import inlineDiffExpansionRow from './inline_diff_expansion_row.vue';
+import { getCommentedLines } from '~/notes/components/multiline_comment_utils';
 
 export default {
   components: {
@@ -31,9 +32,19 @@ export default {
   },
   computed: {
     ...mapGetters('diffs', ['commitId']),
+    ...mapState({
+      selectedCommentPosition: ({ notes }) => notes.selectedCommentPosition,
+      selectedCommentPositionHover: ({ notes }) => notes.selectedCommentPositionHover,
+    }),
     diffLinesLength() {
       return this.diffLines.length;
     },
+    commentedLines() {
+      return getCommentedLines(
+        this.selectedCommentPosition || this.selectedCommentPositionHover,
+        this.diffLines,
+      );
+    },
   },
   userColorScheme: window.gon.user_color_scheme,
 };
@@ -67,6 +78,7 @@ export default {
           :file-path="diffFile.file_path"
           :line="line"
           :is-bottom="index + 1 === diffLinesLength"
+          :is-commented="index >= commentedLines.startLine && index <= commentedLines.endLine"
         />
         <inline-diff-comment-row
           :key="`icr-${line.line_code || index}`"
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
index c2553dc87a6..ccb32a2a745 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_table_row.vue
@@ -40,6 +40,11 @@ export default {
       required: false,
       default: false,
     },
+    isCommented: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
   },
   data() {
     return {
@@ -51,6 +56,8 @@ export default {
     ...mapGetters('diffs', ['fileLineCoverage']),
     ...mapState({
       isHighlighted(state) {
+        if (this.isCommented) return true;
+
         const lineCode =
           (this.line.left && this.line.left.line_code) ||
           (this.line.right && this.line.right.line_code);
diff --git a/app/assets/javascripts/diffs/components/parallel_diff_view.vue b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
index 502c458bf2e..46a691ad22d 100644
--- a/app/assets/javascripts/diffs/components/parallel_diff_view.vue
+++ b/app/assets/javascripts/diffs/components/parallel_diff_view.vue
@@ -1,10 +1,11 @@
 <script>
-import { mapGetters } from 'vuex';
+import { mapGetters, mapState } from 'vuex';
 import draftCommentsMixin from '~/diffs/mixins/draft_comments';
 import ParallelDraftCommentRow from '~/batch_comments/components/parallel_draft_comment_row.vue';
 import parallelDiffTableRow from './parallel_diff_table_row.vue';
 import parallelDiffCommentRow from './parallel_diff_comment_row.vue';
 import parallelDiffExpansionRow from './parallel_diff_expansion_row.vue';
+import { getCommentedLines } from '~/notes/components/multiline_comment_utils';
 
 export default {
   components: {
@@ -31,9 +32,19 @@ export default {
   },
   computed: {
     ...mapGetters('diffs', ['commitId']),
+    ...mapState({
+      selectedCommentPosition: ({ notes }) => notes.selectedCommentPosition,
+      selectedCommentPositionHover: ({ notes }) => notes.selectedCommentPositionHover,
+    }),
     diffLinesLength() {
       return this.diffLines.length;
     },
+    commentedLines() {
+      return getCommentedLines(
+        this.selectedCommentPosition || this.selectedCommentPositionHover,
+        this.diffLines,
+      );
+    },
   },
   userColorScheme: window.gon.user_color_scheme,
 };
@@ -69,6 +80,7 @@ export default {
           :file-path="diffFile.file_path"
           :line="line"
           :is-bottom="index + 1 === diffLinesLength"
+          :is-commented="index >= commentedLines.startLine && index <= commentedLines.endLine"
         />
         <parallel-diff-comment-row
           :key="`dcr-${line.line_code || index}`"
diff --git a/app/assets/javascripts/graphql_shared/fragments/user.fragment.graphql b/app/assets/javascripts/graphql_shared/fragments/user.fragment.graphql
new file mode 100644
index 00000000000..096bb77ee49
--- /dev/null
+++ b/app/assets/javascripts/graphql_shared/fragments/user.fragment.graphql
@@ -0,0 +1,7 @@
+fragment User on User {
+  id
+  avatarUrl
+  name
+  username
+  webUrl
+}
diff --git a/app/assets/javascripts/notes/components/discussion_notes.vue b/app/assets/javascripts/notes/components/discussion_notes.vue
index b5e5daa8809..458da5cf67f 100644
--- a/app/assets/javascripts/notes/components/discussion_notes.vue
+++ b/app/assets/javascripts/notes/components/discussion_notes.vue
@@ -74,7 +74,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions(['toggleDiscussion']),
+    ...mapActions(['toggleDiscussion', 'setSelectedCommentPositionHover']),
     componentName(note) {
       if (note.isPlaceholderNote) {
         if (note.placeholderType === SYSTEM_NOTE) {
@@ -99,7 +99,11 @@ export default {
 
 <template>
   <div class="discussion-notes">
-    <ul class="notes">
+    <ul
+      class="notes"
+      @mouseenter="setSelectedCommentPositionHover(discussion.position.line_range)"
+      @mouseleave="setSelectedCommentPositionHover()"
+    >
       <template v-if="shouldGroupReplies">
         <component
           :is="componentName(firstNote)"
diff --git a/app/assets/javascripts/notes/components/multiline_comment_form.vue b/app/assets/javascripts/notes/components/multiline_comment_form.vue
index 6aa9a9aa450..bb13eb87af7 100644
--- a/app/assets/javascripts/notes/components/multiline_comment_form.vue
+++ b/app/assets/javascripts/notes/components/multiline_comment_form.vue
@@ -1,4 +1,5 @@
 <script>
+import { mapActions } from 'vuex';
 import { GlFormSelect, GlSprintf } from '@gitlab/ui';
 import { getSymbol, getLineClasses } from './multiline_comment_utils';
 
@@ -39,8 +40,13 @@ export default {
       old_line: line.old_line,
       new_line: line.new_line,
     };
+    this.highlightSelection();
+  },
+  destroyed() {
+    this.setSelectedCommentPosition();
   },
   methods: {
+    ...mapActions(['setSelectedCommentPosition']),
     getSymbol({ type }) {
       return getSymbol(type);
     },
@@ -50,6 +56,16 @@ export default {
     updateCommentLineStart(value) {
       this.commentLineStart = value;
       this.$emit('input', value);
+      this.highlightSelection();
+    },
+    highlightSelection() {
+      const { line_code, new_line, old_line, type } = this.line;
+      const updatedLineRange = {
+        start: { ...this.commentLineStart },
+        end: { line_code, new_line, old_line, type },
+      };
+
+      this.setSelectedCommentPosition(updatedLineRange);
     },
   },
 };
diff --git a/app/assets/javascripts/notes/components/multiline_comment_utils.js b/app/assets/javascripts/notes/components/multiline_comment_utils.js
index e8a834df713..dbae10c8f6c 100644
--- a/app/assets/javascripts/notes/components/multiline_comment_utils.js
+++ b/app/assets/javascripts/notes/components/multiline_comment_utils.js
@@ -90,3 +90,22 @@ export function formatLineRange(start, end) {
     end: extractProps(end),
   };
 }
+
+export function getCommentedLines(selectedCommentPosition, diffLines) {
+  if (!selectedCommentPosition) {
+    // This structure simplifies the logic that consumes this result
+    // by keeping the returned shape the same and adjusting the bounds
+    // to something unreachable. This way our component logic stays:
+    // "if index between start and end"
+    return {
+      startLine: diffLines.length + 1,
+      endLine: diffLines.length + 1,
+    };
+  }
+
+  const { start, end } = selectedCommentPosition;
+  const startLine = diffLines.findIndex(l => l.line_code === start.line_code);
+  const endLine = diffLines.findIndex(l => l.line_code === end.line_code);
+
+  return { startLine, endLine };
+}
diff --git a/app/assets/javascripts/notes/components/noteable_note.vue b/app/assets/javascripts/notes/components/noteable_note.vue
index 45cf7888aff..56d82597573 100644
--- a/app/assets/javascripts/notes/components/noteable_note.vue
+++ b/app/assets/javascripts/notes/components/noteable_note.vue
@@ -186,6 +186,7 @@ export default {
     eventHub.$on('enterEditMode', ({ noteId }) => {
       if (noteId === this.note.id) {
         this.isEditing = true;
+        this.setSelectedCommentPositionHover();
         this.scrollToNoteIfNeeded($(this.$el));
       }
     });
@@ -205,9 +206,11 @@ export default {
       'toggleResolveNote',
       'scrollToNoteIfNeeded',
       'updateAssignees',
+      'setSelectedCommentPositionHover',
     ]),
     editHandler() {
       this.isEditing = true;
+      this.setSelectedCommentPositionHover();
       this.$emit('handleEdit');
     },
     deleteHandler() {
@@ -284,6 +287,7 @@ export default {
           } else {
             this.isRequesting = false;
             this.isEditing = true;
+            this.setSelectedCommentPositionHover();
             this.$nextTick(() => {
               const msg = __('Something went wrong while editing your comment. Please try again.');
               Flash(msg, 'alert', this.$el);
@@ -340,7 +344,7 @@ export default {
         :line="line"
         :comment-line-options="commentLineOptions"
         :line-range="note.position.line_range"
-        class="gl-mb-3 gl-text-gray-700 gl-border-gray-100 gl-border-b-solid gl-border-b-1 gl-pb-3"
+        class="gl-mb-3 gl-text-gray-700 gl-pb-3"
       />
       <div
         v-else
diff --git a/app/assets/javascripts/notes/stores/actions.js b/app/assets/javascripts/notes/stores/actions.js
index 8a7734f4d31..5b2ab255557 100644
--- a/app/assets/javascripts/notes/stores/actions.js
+++ b/app/assets/javascripts/notes/stores/actions.js
@@ -99,6 +99,14 @@ export const setDiscussionSortDirection = ({ commit }, direction) => {
   commit(types.SET_DISCUSSIONS_SORT, direction);
 };
 
+export const setSelectedCommentPosition = ({ commit }, position) => {
+  commit(types.SET_SELECTED_COMMENT_POSITION, position);
+};
+
+export const setSelectedCommentPositionHover = ({ commit }, position) => {
+  commit(types.SET_SELECTED_COMMENT_POSITION_HOVER, position);
+};
+
 export const removeNote = ({ commit, dispatch, state }, note) => {
   const discussion = state.discussions.find(({ id }) => id === note.discussion_id);
 
diff --git a/app/assets/javascripts/notes/stores/modules/index.js b/app/assets/javascripts/notes/stores/modules/index.js
index c71e62cb551..1649e63c61f 100644
--- a/app/assets/javascripts/notes/stores/modules/index.js
+++ b/app/assets/javascripts/notes/stores/modules/index.js
@@ -12,6 +12,15 @@ export default () => ({
     lastFetchedAt: null,
     currentDiscussionId: null,
     batchSuggestionsInfo: [],
+    /**
+     * selectedCommentPosition & selectedCommentPosition structures are the same as `position.line_range`:
+     * {
+     *  start: { line_code: string, new_line: number, old_line:number, type: string },
+     *  end: { line_code: string, new_line: number, old_line:number, type: string },
+     * }
+     */
+    selectedCommentPosition: null,
+    selectedCommentPositionHover: null,
 
     // View layer
     isToggleStateButtonLoading: false,
diff --git a/app/assets/javascripts/notes/stores/mutation_types.js b/app/assets/javascripts/notes/stores/mutation_types.js
index efb24479f7c..f2236b18beb 100644
--- a/app/assets/javascripts/notes/stores/mutation_types.js
+++ b/app/assets/javascripts/notes/stores/mutation_types.js
@@ -33,6 +33,8 @@ export const SET_EXPAND_DISCUSSIONS = 'SET_EXPAND_DISCUSSIONS';
 export const UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS = 'UPDATE_RESOLVABLE_DISCUSSIONS_COUNTS';
 export const SET_CURRENT_DISCUSSION_ID = 'SET_CURRENT_DISCUSSION_ID';
 export const SET_DISCUSSIONS_SORT = 'SET_DISCUSSIONS_SORT';
+export const SET_SELECTED_COMMENT_POSITION = 'SET_SELECTED_COMMENT_POSITION';
+export const SET_SELECTED_COMMENT_POSITION_HOVER = 'SET_SELECTED_COMMENT_POSITION_HOVER';
 
 // Issue
 export const CLOSE_ISSUE = 'CLOSE_ISSUE';
diff --git a/app/assets/javascripts/notes/stores/mutations.js b/app/assets/javascripts/notes/stores/mutations.js
index 7ed0dd84b65..e5f1c11fb35 100644
--- a/app/assets/javascripts/notes/stores/mutations.js
+++ b/app/assets/javascripts/notes/stores/mutations.js
@@ -308,6 +308,14 @@ export default {
     state.discussionSortOrder = sort;
   },
 
+  [types.SET_SELECTED_COMMENT_POSITION](state, position) {
+    state.selectedCommentPosition = position;
+  },
+
+  [types.SET_SELECTED_COMMENT_POSITION_HOVER](state, position) {
+    state.selectedCommentPositionHover = position;
+  },
+
   [types.DISABLE_COMMENTS](state, value) {
     state.commentsDisabled = value;
   },
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index c1f350dccd6..5e0ad7acdfd 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -97,6 +97,7 @@ export default {
               :path="entry.flatPath"
               :type="entry.type"
               :url="entry.webUrl"
+              :mode="entry.mode"
               :submodule-tree-url="entry.treeUrl"
               :lfs-oid="entry.lfsOid"
               :loading-path="loadingPath"
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index d5363016335..615e329f415 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -66,6 +66,11 @@ export default {
       type: String,
       required: true,
     },
+    mode: {
+      type: String,
+      required: false,
+      default: '',
+    },
     type: {
       type: String,
       required: true,
@@ -140,6 +145,7 @@ export default {
       >
         <file-icon
           :file-name="fullPath"
+          :file-mode="mode"
           :folder="isFolder"
           :submodule="isSubmodule"
           :loading="path === loadingPath"
diff --git a/app/assets/javascripts/vue_shared/components/file_icon.vue b/app/assets/javascripts/vue_shared/components/file_icon.vue
index b084ebdf774..7484486d6b4 100644
--- a/app/assets/javascripts/vue_shared/components/file_icon.vue
+++ b/app/assets/javascripts/vue_shared/components/file_icon.vue
@@ -1,6 +1,7 @@
 <script>
 import { GlLoadingIcon, GlIcon } from '@gitlab/ui';
 import getIconForFile from './file_icon/file_icon_map';
+import { FILE_SYMLINK_MODE } from '../constants';
 
 /* This is a re-usable vue component for rendering a svg sprite
     icon
@@ -24,6 +25,11 @@ export default {
       type: String,
       required: true,
     },
+    fileMode: {
+      type: String,
+      required: false,
+      default: '',
+    },
 
     folder: {
       type: Boolean,
@@ -60,8 +66,12 @@ export default {
     },
   },
   computed: {
+    isSymlink() {
+      return this.fileMode === FILE_SYMLINK_MODE;
+    },
     spriteHref() {
       const iconName = this.submodule ? 'folder-git' : getIconForFile(this.fileName) || 'file';
+
       return `${gon.sprite_file_icons}#${iconName}`;
     },
     folderIconName() {
@@ -75,13 +85,11 @@ export default {
 </script>
 <template>
   <span>
-    <svg v-if="!loading && !folder" :class="[iconSizeClass, cssClasses]">
-      <use v-bind="{ 'xlink:href': spriteHref }" /></svg
-    ><gl-icon
-      v-if="!loading && folder"
-      :name="folderIconName"
-      :size="size"
-      class="folder-icon"
-    /><gl-loading-icon v-if="loading" :inline="true" />
+    <gl-loading-icon v-if="loading" :inline="true" />
+    <gl-icon v-else-if="isSymlink" name="symlink" :size="size" />
+    <svg v-else-if="!folder" :class="[iconSizeClass, cssClasses]">
+      <use v-bind="{ 'xlink:href': spriteHref }" />
+    </svg>
+    <gl-icon v-else :name="folderIconName" :size="size" class="folder-icon" />
   </span>
 </template>
diff --git a/app/assets/javascripts/vue_shared/constants.js b/app/assets/javascripts/vue_shared/constants.js
index 63ce4212717..235beb1f22d 100644
--- a/app/assets/javascripts/vue_shared/constants.js
+++ b/app/assets/javascripts/vue_shared/constants.js
@@ -6,6 +6,8 @@ const INTERVALS = {
   day: 'day',
 };
 
+export const FILE_SYMLINK_MODE = '120000';
+
 export const timeRanges = [
   {
     label: __('30 minutes'),
diff --git a/app/assets/stylesheets/components/design_management/design.scss b/app/assets/stylesheets/components/design_management/design.scss
index 60b71137b25..8f632b87376 100644
--- a/app/assets/stylesheets/components/design_management/design.scss
+++ b/app/assets/stylesheets/components/design_management/design.scss
@@ -10,7 +10,7 @@
   }
 
   .design-pin {
-    transition: opacity 0.5s ease;
+    transition: opacity $gl-transition-duration-medium $general-hover-transition-curve;
 
     &.inactive {
       @include gl-opacity-5;
@@ -108,6 +108,7 @@
     .design-note {
       padding: $gl-padding;
       list-style: none;
+      transition: background $gl-transition-duration-medium $general-hover-transition-curve;
 
       a {
         color: inherit;
@@ -150,7 +151,7 @@
 }
 
 .design-dropzone-card {
-  transition: border $general-hover-transition-duration $general-hover-transition-curve;
+  transition: border $gl-transition-duration-medium $general-hover-transition-curve;
   color: $gl-text-color;
 
   &:focus,
diff --git a/app/graphql/resolvers/issues_resolver.rb b/app/graphql/resolvers/issues_resolver.rb
index 65e11bd1e84..9d0535a208f 100644
--- a/app/graphql/resolvers/issues_resolver.rb
+++ b/app/graphql/resolvers/issues_resolver.rb
@@ -92,3 +92,5 @@ module Resolvers
     end
   end
 end
+
+Resolvers::IssuesResolver.prepend_if_ee('::EE::Resolvers::IssuesResolver')
diff --git a/app/graphql/types/issue_connection_type.rb b/app/graphql/types/issue_connection_type.rb
new file mode 100644
index 00000000000..beed392f01a
--- /dev/null
+++ b/app/graphql/types/issue_connection_type.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Types
+  # rubocop: disable Graphql/AuthorizeTypes
+  class IssueConnectionType < GraphQL::Types::Relay::BaseConnection
+    field :count, Integer, null: false,
+          description: 'Total count of collection'
+
+    def count
+      object.items.size
+    end
+  end
+end
diff --git a/app/graphql/types/issue_type.rb b/app/graphql/types/issue_type.rb
index 1487e496107..9baa0018999 100644
--- a/app/graphql/types/issue_type.rb
+++ b/app/graphql/types/issue_type.rb
@@ -4,6 +4,8 @@ module Types
   class IssueType < BaseObject
     graphql_name 'Issue'
 
+    connection_type_class(Types::IssueConnectionType)
+
     implements(Types::Notes::NoteableType)
 
     authorize :read_issue
diff --git a/app/views/shared/issuable/_bulk_update_sidebar.html.haml b/app/views/shared/issuable/_bulk_update_sidebar.html.haml
index e1e9bdacd4f..ec7ff127ed5 100644
--- a/app/views/shared/issuable/_bulk_update_sidebar.html.haml
+++ b/app/views/shared/issuable/_bulk_update_sidebar.html.haml
@@ -1,5 +1,5 @@
 - type = local_assigns.fetch(:type)
-- bulk_issue_health_status_flag = Feature.enabled?(:bulk_update_health_status, @project&.group) && type == :issues && @project&.group&.feature_available?(:issuable_health_status)
+- bulk_issue_health_status_flag = Feature.enabled?(:bulk_update_health_status, @project&.group, default_enabled: true) && type == :issues && @project&.group&.feature_available?(:issuable_health_status)
 - epic_bulk_edit_flag = @project&.group&.feature_available?(:epics) && type == :issues
 
 %aside.issues-bulk-update.js-right-sidebar.right-sidebar{ "aria-live" => "polite", data: { 'signed-in': current_user.present? } }
diff --git a/changelogs/unreleased/design-management-transitions.yml b/changelogs/unreleased/design-management-transitions.yml
new file mode 100644
index 00000000000..755f5d7ac2d
--- /dev/null
+++ b/changelogs/unreleased/design-management-transitions.yml
@@ -0,0 +1,5 @@
+---
+title: Improve animations of design note selection in design management
+merge_request: 36927
+author:
+type: changed
diff --git a/changelogs/unreleased/jdb-highlight-commented-rows.yml b/changelogs/unreleased/jdb-highlight-commented-rows.yml
new file mode 100644
index 00000000000..a4aa76ca684
--- /dev/null
+++ b/changelogs/unreleased/jdb-highlight-commented-rows.yml
@@ -0,0 +1,5 @@
+---
+title: Highlight commented rows
+merge_request: 34432
+author:
+type: added
diff --git a/changelogs/unreleased/symlink-icon-ui.yml b/changelogs/unreleased/symlink-icon-ui.yml
new file mode 100644
index 00000000000..6a907bec6cb
--- /dev/null
+++ b/changelogs/unreleased/symlink-icon-ui.yml
@@ -0,0 +1,5 @@
+---
+title: Show symlink icon in repository browser
+merge_request: 36524
+author:
+type: fixed
diff --git a/doc/.vale/gitlab/AlertBoxStyle.yml b/doc/.vale/gitlab/AlertBoxStyle.yml
index 4eeda2ef37c..831d5395fc8 100644
--- a/doc/.vale/gitlab/AlertBoxStyle.yml
+++ b/doc/.vale/gitlab/AlertBoxStyle.yml
@@ -10,4 +10,7 @@ link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#alert
 level: error
 scope: raw
 raw:
-  - 'NOTE: \*\*[^:]*\*\*'
+  - '((NOTE|TIP|CAUTION|DANGER): \*\*[^:]*\*\*)|'
+  - '((NOTE: \*\*NOTE:\*\*)|(TIP: \*\*TIP:\*\*)|(CAUTION: \*\*CAUTION:\*\*)|(DANGER: \*\*DANGER:\*\*))|'
+  - '((NOTE: \*\*note:\*\*)|(TIP: \*\*tip:\*\*)|(CAUTION: \*\*caution:\*\*)|(DANGER: \*\*danger:\*\*))|'
+  - '((NOTE|TIP|CAUTION|DANGER): \*\*.*\*\*.+)'
diff --git a/doc/administration/auth/jwt.md b/doc/administration/auth/jwt.md
index 29b192a4845..d3a77fdaca5 100644
--- a/doc/administration/auth/jwt.md
+++ b/doc/administration/auth/jwt.md
@@ -62,7 +62,8 @@ JWT will provide you with a secret key for you to use.
      }
    ```
 
-   NOTE: **Note:** For more information on each configuration option refer to
+   NOTE: **Note:**
+   For more information on each configuration option refer to
    the [OmniAuth JWT usage documentation](https://github.com/mbleigh/omniauth-jwt#usage).
 
 1. Change `YOUR_APP_SECRET` to the client secret and set `auth_url` to your redirect URL.
diff --git a/doc/administration/auth/ldap/google_secure_ldap.md b/doc/administration/auth/ldap/google_secure_ldap.md
index 2271ce93b6f..1f8fca33811 100644
--- a/doc/administration/auth/ldap/google_secure_ldap.md
+++ b/doc/administration/auth/ldap/google_secure_ldap.md
@@ -34,7 +34,8 @@ The steps below cover:
    'Entire domain (GitLab)' or 'Selected organizational units' for both 'Verify user
    credentials' and 'Read user information'. Select 'Add LDAP Client'
 
-   TIP: **Tip:** If you plan to use GitLab [LDAP Group Sync](index.md#group-sync-starter-only)
+   TIP: **Tip:**
+   If you plan to use GitLab [LDAP Group Sync](index.md#group-sync-starter-only)
    , turn on 'Read group information'.
 
    ![Add LDAP Client Step 2](img/google_secure_ldap_add_step_2.png)
diff --git a/doc/administration/auth/ldap/ldap-troubleshooting.md b/doc/administration/auth/ldap/ldap-troubleshooting.md
index fb8a77a523c..75183f54990 100644
--- a/doc/administration/auth/ldap/ldap-troubleshooting.md
+++ b/doc/administration/auth/ldap/ldap-troubleshooting.md
@@ -357,7 +357,7 @@ GitLab syncs the `admin_group`.
 
 #### Sync all groups **(STARTER ONLY)**
 
-NOTE: **NOTE:**
+NOTE: **Note:**
 To sync all groups manually when debugging is unnecessary, [use the Rake
 task](../../raketasks/ldap.md#run-a-group-sync-starter-only) instead.
 
@@ -653,7 +653,7 @@ adfind -h ad.example.org:636 -ssl -u "CN=GitLabSRV,CN=Users,DC=GitLab,DC=org" -u
 
 ### Rails console
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 Please note that it is very easy to create, read, modify, and destroy data on the
 rails console, so please be sure to run commands exactly as listed.
 
diff --git a/doc/administration/geo/disaster_recovery/bring_primary_back.md b/doc/administration/geo/disaster_recovery/bring_primary_back.md
index b19e55595e7..3b7c7fd549c 100644
--- a/doc/administration/geo/disaster_recovery/bring_primary_back.md
+++ b/doc/administration/geo/disaster_recovery/bring_primary_back.md
@@ -32,13 +32,15 @@ To bring the former **primary** node up to date:
    sudo gitlab-ctl start
    ```
 
-   NOTE: **Note:** If you [disabled the **primary** node permanently](index.md#step-2-permanently-disable-the-primary-node),
+   NOTE: **Note:**
+   If you [disabled the **primary** node permanently](index.md#step-2-permanently-disable-the-primary-node),
    you need to undo those steps now. For Debian/Ubuntu you just need to run
    `sudo systemctl enable gitlab-runsvdir`. For CentOS 6, you need to install
    the GitLab instance from scratch and set it up as a **secondary** node by
    following [Setup instructions](../replication/index.md#setup-instructions). In this case, you don't need to follow the next step.
 
-   NOTE: **Note:** If you [changed the DNS records](index.md#step-4-optional-updating-the-primary-domain-dns-record)
+   NOTE: **Note:**
+   If you [changed the DNS records](index.md#step-4-optional-updating-the-primary-domain-dns-record)
    for this node during disaster recovery procedure you may need to [block
    all the writes to this node](planned_failover.md#prevent-updates-to-the-primary-node)
    during this procedure.
diff --git a/doc/administration/geo/replication/database.md b/doc/administration/geo/replication/database.md
index 3f2d46ba457..02f51e79907 100644
--- a/doc/administration/geo/replication/database.md
+++ b/doc/administration/geo/replication/database.md
@@ -130,7 +130,8 @@ There is an [issue where support is being discussed](https://gitlab.com/gitlab-o
    connect to the **primary** node's database. For this reason, we need the address of
    each node.
 
-   NOTE: **Note:** For external PostgreSQL instances, see [additional instructions](external_database.md).
+   NOTE: **Note:**
+   For external PostgreSQL instances, see [additional instructions](external_database.md).
 
    If you are using a cloud provider, you can lookup the addresses for each
    Geo node through your cloud provider's management console.
@@ -419,7 +420,8 @@ data before running `pg_basebackup`.
 
 1. Execute the command below to start a backup/restore and begin the replication
 
-   CAUTION: **Warning:** Each Geo **secondary** node must have its own unique replication slot name.
+   CAUTION: **Warning:**
+   Each Geo **secondary** node must have its own unique replication slot name.
    Using the same slot name between two secondaries will break PostgreSQL replication.
 
    ```shell
diff --git a/doc/administration/geo/replication/datatypes.md b/doc/administration/geo/replication/datatypes.md
index de8263166ad..063bb5f540f 100644
--- a/doc/administration/geo/replication/datatypes.md
+++ b/doc/administration/geo/replication/datatypes.md
@@ -126,7 +126,7 @@ these epics/issues:
 - [Unreplicated Data Types](https://gitlab.com/groups/gitlab-org/-/epics/893)
 - [Verify all replicated data](https://gitlab.com/groups/gitlab-org/-/epics/1430)
 
-DANGER: **DANGER**
+DANGER: **Danger:**
 Features not on this list, or with **No** in the **Replicated** column,
 are not replicated on the **secondary** node. Failing over without manually
 replicating data from those features will cause the data to be **lost**.
diff --git a/doc/administration/geo/replication/external_database.md b/doc/administration/geo/replication/external_database.md
index 491b3278ead..e85a82fa414 100644
--- a/doc/administration/geo/replication/external_database.md
+++ b/doc/administration/geo/replication/external_database.md
@@ -270,7 +270,8 @@ the tracking database on port 5432.
    query_exec "GRANT USAGE ON FOREIGN SERVER gitlab_secondary TO ${GEO_DB_USER};"
    ```
 
-   NOTE: **Note:** The script template above uses `gitlab-psql` as it's intended to be executed from the Geo machine,
+   NOTE: **Note:**
+   The script template above uses `gitlab-psql` as it's intended to be executed from the Geo machine,
    but you can change it to `psql` and run it from any machine that has access to the database. We also recommend using
    `psql` for AWS RDS.
 
diff --git a/doc/administration/geo/replication/multiple_servers.md b/doc/administration/geo/replication/multiple_servers.md
index dddb7d3236d..d8f04e07fb0 100644
--- a/doc/administration/geo/replication/multiple_servers.md
+++ b/doc/administration/geo/replication/multiple_servers.md
@@ -90,7 +90,8 @@ The following steps enable a GitLab cluster to serve as the **primary** node.
 
 After making these changes, [reconfigure GitLab](../../restart_gitlab.md#omnibus-gitlab-reconfigure) so the changes take effect.
 
-NOTE: **Note:** PostgreSQL and Redis should have already been disabled on the
+NOTE: **Note:**
+PostgreSQL and Redis should have already been disabled on the
 application servers, and connections from the application servers to those
 services on the backend servers configured, during normal GitLab multi-node set up. See
 multi-node configuration documentation for
@@ -141,7 +142,8 @@ recommended.
 
 ### Step 2: Configure the main read-only replica PostgreSQL database on the **secondary** node
 
-NOTE: **Note:** The following documentation assumes the database will be run on
+NOTE: **Note:**
+The following documentation assumes the database will be run on
 a single node only. Multi-node PostgreSQL on **secondary** nodes is
 [not currently supported](https://gitlab.com/groups/gitlab-org/-/epics/2536).
 
@@ -206,7 +208,8 @@ If using an external PostgreSQL instance, refer also to
 
 ### Step 3: Configure the tracking database on the **secondary** node
 
-NOTE: **Note:** This documentation assumes the tracking database will be run on
+NOTE: **Note:**
+This documentation assumes the tracking database will be run on
 only a single machine, rather than as a PostgreSQL cluster.
 
 Configure the tracking database.
diff --git a/doc/administration/geo/replication/troubleshooting.md b/doc/administration/geo/replication/troubleshooting.md
index 595447eeebc..c2f8aa35d2d 100644
--- a/doc/administration/geo/replication/troubleshooting.md
+++ b/doc/administration/geo/replication/troubleshooting.md
@@ -452,13 +452,13 @@ to start again from scratch, there are a few steps that can help you:
    chown git:git /var/opt/gitlab/git-data/repositories
    ```
 
-   TIP: **Tip**
+   TIP: **Tip:**
    You may want to remove the `/var/opt/gitlab/git-data/repositories.old` in the future
    as soon as you confirmed that you don't need it anymore, to save disk space.
 
 1. _(Optional)_ Rename other data folders and create new ones
 
-   CAUTION: **Caution**:
+   CAUTION: **Caution:**
    You may still have files on the **secondary** node that have been removed from **primary** node but
    removal have not been reflected. If you skip this step, they will never be removed
    from this Geo node.
@@ -701,7 +701,8 @@ To check the configuration:
    Description          |
    ```
 
-   NOTE: **Note:** Pay particular attention to the host and port under
+   NOTE: **Note:**
+   Pay particular attention to the host and port under
    FDW options. That configuration should point to the Geo secondary
    database.
 
diff --git a/doc/administration/geo/replication/updating_the_geo_nodes.md b/doc/administration/geo/replication/updating_the_geo_nodes.md
index 4a7a04155bb..c0b1bc6688c 100644
--- a/doc/administration/geo/replication/updating_the_geo_nodes.md
+++ b/doc/administration/geo/replication/updating_the_geo_nodes.md
@@ -36,7 +36,8 @@ different steps.
 
 ## General update steps
 
-NOTE: **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).
+NOTE: **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).
 
 To update the Geo nodes when a new GitLab version is released, update **primary**
 and all **secondary** nodes:
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index 7aed1695017..6a8037ffd66 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -136,7 +136,8 @@ We will note in the instructions below where these secrets are required.
 
 ### PostgreSQL
 
-NOTE: **Note:** do not store the GitLab application database and the Praefect
+NOTE: **Note:**
+do not store the GitLab application database and the Praefect
 database on the same PostgreSQL server if using
 [Geo](../geo/replication/index.md). The replication state is internal to each instance
 of GitLab and should not be replicated.
@@ -286,7 +287,8 @@ application server, or a Gitaly node.
    so we use `default` here as well. This cluster has three Gitaly nodes `gitaly-1`,
    `gitaly-2`, and `gitaly-3`, which will be replicas of each other.
 
-   CAUTION: **CAUTION:** If you have data on an already existing storage called
+   CAUTION: **Caution:**
+   If you have data on an already existing storage called
    `default`, you should configure the virtual storage with another name and
    [migrate the data to the Praefect storage](#migrating-existing-repositories-to-praefect)
    afterwards.
@@ -300,7 +302,8 @@ application server, or a Gitaly node.
    More Gitaly nodes can be added to the cluster to increase the number of
    replicas. More clusters can also be added for very large GitLab instances.
 
-   NOTE: **Note:** The `gitaly-1` node is currently denoted the primary. This
+   NOTE: **Note:**
+   The `gitaly-1` node is currently denoted the primary. This
    can be used to manually fail from one node to another. This will be removed
    in the [future](https://gitlab.com/gitlab-org/gitaly/-/issues/2634).
 
@@ -493,7 +496,8 @@ To configure Praefect with TLS:
 
 ### Gitaly
 
-NOTE: **Note:** Complete these steps for **each** Gitaly node.
+NOTE: **Note:**
+Complete these steps for **each** Gitaly node.
 
 To complete this section you will need:
 
@@ -700,7 +704,8 @@ Particular attention should be shown to:
 1. Disable the default Gitaly service running on the GitLab host. It won't be needed
    as GitLab will connect to the configured cluster.
 
-   CAUTION: **CAUTION** If you have existing data stored on the default Gitaly storage,
+   CAUTION: **Caution:**
+   If you have existing data stored on the default Gitaly storage,
    you should [migrate the data your Praefect storage first](#migrating-existing-repositories-to-praefect).
 
    ```ruby
@@ -966,7 +971,8 @@ Virtual storage: default
 
 Currently `dataloss` only considers a repository up to date if it has been directly replicated to from the previous write-enabled primary. While reconciling from an up to date secondary can recover the data, this is not visible in the data loss report. This is due for improvement via [Gitaly#2866](https://gitlab.com/gitlab-org/gitaly/-/issues/2866).
 
-NOTE: **Note:** `dataloss` is still in beta and the output format is subject to change.
+NOTE: **Note:**
+`dataloss` is still in beta and the output format is subject to change.
 
 ### Checking repository checksums
 
diff --git a/doc/administration/high_availability/consul.md b/doc/administration/high_availability/consul.md
index a87c1f1027f..978ba08c4fa 100644
--- a/doc/administration/high_availability/consul.md
+++ b/doc/administration/high_availability/consul.md
@@ -113,14 +113,14 @@ Nodes running GitLab-bundled Consul should be:
 - Members of a healthy cluster prior to upgrading the Omnibus GitLab package.
 - Upgraded one node at a time.
 
-NOTE: **NOTE:**
+NOTE: **Note:**
 Running `curl http://127.0.0.1:8500/v1/health/state/critical` from any Consul node will identify existing health issues in the cluster. The command will return an empty array if the cluster is healthy.
 
 Consul clusters communicate using the raft protocol. If the current leader goes offline, there needs to be a leader election. A leader node must exist to facilitate synchronization across the cluster. If too many nodes go offline at the same time, the cluster will lose quorum and not elect a leader due to [broken consensus](https://www.consul.io/docs/internals/consensus.html).
 
 Consult the [troubleshooting section](#troubleshooting) if the cluster is not able to recover after the upgrade. The [outage recovery](#outage-recovery) may be of particular interest.
 
-NOTE: **NOTE:**
+NOTE: **Note:**
 GitLab only uses Consul to store transient data that is easily regenerated. If the bundled Consul was not used by any process other than GitLab itself, then [rebuilding the cluster from scratch](#recreate-from-scratch) is fine.
 
 ## Troubleshooting
diff --git a/doc/administration/high_availability/gitlab.md b/doc/administration/high_availability/gitlab.md
index 2c0b8d4125d..dc8c997bab5 100644
--- a/doc/administration/high_availability/gitlab.md
+++ b/doc/administration/high_availability/gitlab.md
@@ -6,11 +6,13 @@ type: reference
 
 This section describes how to configure the GitLab application (Rails) component.
 
-NOTE: **Note:** There is some additional configuration near the bottom for
+NOTE: **Note:**
+There is some additional configuration near the bottom for
 additional GitLab application servers. It's important to read and understand
 these additional steps before proceeding with GitLab installation.
 
-NOTE: **Note:** [Cloud Object Storage service](object_storage.md) with [Gitaly](gitaly.md)
+NOTE: **Note:**
+[Cloud Object Storage service](object_storage.md) with [Gitaly](gitaly.md)
 is recommended over [NFS](nfs.md) wherever possible for improved performance.
 
 1. If necessary, install the NFS client utility packages using the following
@@ -79,19 +81,22 @@ is recommended over [NFS](nfs.md) wherever possible for improved performance.
 
 1. [Enable monitoring](#enable-monitoring)
 
-   NOTE: **Note:** To maintain uniformity of links across HA clusters, the `external_url`
+   NOTE: **Note:**
+   To maintain uniformity of links across HA clusters, the `external_url`
    on the first application server as well as the additional application
    servers should point to the external URL that users will use to access GitLab.
    In a typical HA setup, this will be the URL of the load balancer which will
    route traffic to all GitLab application servers in the HA cluster.
 
-   NOTE: **Note:** When you specify `https` in the `external_url`, as in the example
+   NOTE: **Note:**
+   When you specify `https` in the `external_url`, as in the example
    above, GitLab assumes you have SSL certificates in `/etc/gitlab/ssl/`. If
    certificates are not present, NGINX will fail to start. See
    [NGINX documentation](https://docs.gitlab.com/omnibus/settings/nginx.html#enable-https)
    for more information.
 
-   NOTE: **Note:** It is best to set the `uid` and `gid`s prior to the initial reconfigure
+   NOTE: **Note:**
+   It is best to set the `uid` and `gid`s prior to the initial reconfigure
    of GitLab. Omnibus will not recursively `chown` directories if set after the initial reconfigure.
 
 ## First GitLab application server
@@ -133,7 +138,8 @@ need some extra configuration.
 
 1. Run `sudo gitlab-ctl reconfigure` to compile the configuration.
 
-NOTE: **Note:** You will need to restart the GitLab applications nodes after an update has occurred and database
+NOTE: **Note:**
+You will need to restart the GitLab applications nodes after an update has occurred and database
 migrations performed.
 
 ## Enable Monitoring
diff --git a/doc/administration/high_availability/nfs.md b/doc/administration/high_availability/nfs.md
index b01e6820814..6e8dc2c6c57 100644
--- a/doc/administration/high_availability/nfs.md
+++ b/doc/administration/high_availability/nfs.md
@@ -12,7 +12,8 @@ From GitLab 13.0, using NFS for Git repositories is deprecated. In GitLab 14.0,
 support for NFS for Git repositories is scheduled to be removed. Upgrade to
 [Gitaly Cluster](../gitaly/praefect.md) as soon as possible.
 
-NOTE: **Note:** Filesystem performance has a big impact on overall GitLab
+NOTE: **Note:**
+Filesystem performance has a big impact on overall GitLab
 performance, especially for actions that read or write to Git repositories. See
 [Filesystem Performance Benchmarking](../operations/filesystem_benchmarking.md)
 for steps to test filesystem performance.
@@ -105,7 +106,8 @@ administrators to keep NFS server delegation disabled.
 
 #### Improving NFS performance with Unicorn
 
-NOTE: **Note:** From GitLab 12.1, it will automatically be detected if Rugged can and should be used per storage.
+NOTE: **Note:**
+From GitLab 12.1, it will automatically be detected if Rugged can and should be used per storage.
 
 If you previously enabled Rugged using the feature flag, you will need to unset the feature flag by using:
 
@@ -117,7 +119,8 @@ If the Rugged feature flag is explicitly set to either true or false, GitLab wil
 
 #### Improving NFS performance with Puma
 
-NOTE: **Note:** From GitLab 12.7, Rugged auto-detection is disabled if Puma thread count is greater than 1.
+NOTE: **Note:**
+From GitLab 12.7, Rugged auto-detection is disabled if Puma thread count is greater than 1.
 
 If you want to use Rugged with Puma, it is recommended to [set Puma thread count to 1](https://docs.gitlab.com/omnibus/settings/puma.html#puma-settings).
 
diff --git a/doc/administration/high_availability/sidekiq.md b/doc/administration/high_availability/sidekiq.md
index 493929dcf3b..98a9af64e5e 100644
--- a/doc/administration/high_availability/sidekiq.md
+++ b/doc/administration/high_availability/sidekiq.md
@@ -94,7 +94,8 @@ you want using steps 1 and 2 from the GitLab downloads page.
 
 1. Run `gitlab-ctl reconfigure`.
 
-NOTE: **Note:** You will need to restart the Sidekiq nodes after an update has occurred and database
+NOTE: **Note:**
+You will need to restart the Sidekiq nodes after an update has occurred and database
 migrations performed.
 
 ## Example configuration
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md
index 3b4eeee6d17..6c9a302da11 100644
--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -83,7 +83,8 @@ Plan.default.actual_limits.update!(project_hooks: 100)
 Plan.default.actual_limits.update!(group_hooks: 100)
 ```
 
-NOTE: **Note:** Set the limit to `0` to disable it.
+NOTE: **Note:**
+Set the limit to `0` to disable it.
 
 ## Incoming emails from auto-responders
 
@@ -120,7 +121,8 @@ Plan.default.actual_limits.update!(offset_pagination_limit: 10000)
 
 - **Default offset pagination limit:** 50000
 
-NOTE: **Note:** Set the limit to `0` to disable it.
+NOTE: **Note:**
+Set the limit to `0` to disable it.
 
 ## CI/CD limits
 
@@ -152,7 +154,8 @@ To set this limit on a self-managed installation, run the following in the
 Plan.default.actual_limits.update!(ci_active_jobs: 500)
 ```
 
-NOTE: **Note:** Set the limit to `0` to disable it.
+NOTE: **Note:**
+Set the limit to `0` to disable it.
 
 ### Number of CI/CD subscriptions to a project
 
@@ -174,7 +177,8 @@ To set this limit on a self-managed installation, run the following in the
 Plan.default.actual_limits.update!(ci_project_subscriptions: 500)
 ```
 
-NOTE: **Note:** Set the limit to `0` to disable it.
+NOTE: **Note:**
+Set the limit to `0` to disable it.
 
 ### Number of pipeline schedules
 
@@ -306,7 +310,8 @@ characters and the rest will not be indexed and hence will not be searchable.
 This limit can be configured for self-managed installations when [enabling
 Elasticsearch](../integration/elasticsearch.md#enabling-elasticsearch).
 
-NOTE: **Note:** Set the limit to `0` to disable it.
+NOTE: **Note:**
+Set the limit to `0` to disable it.
 
 ## Wiki limits
 
diff --git a/doc/administration/integration/plantuml.md b/doc/administration/integration/plantuml.md
index cd25fbf351b..2a30eced7c4 100644
--- a/doc/administration/integration/plantuml.md
+++ b/doc/administration/integration/plantuml.md
@@ -130,7 +130,8 @@ that, login with an Admin account and do following:
 - Check **Enable PlantUML** checkbox.
 - Set the PlantUML instance as `https://gitlab.example.com/-/plantuml/`.
 
-NOTE: **Note:** If you are using a PlantUML server running v1.2020.9 and
+NOTE: **Note:**
+If you are using a PlantUML server running v1.2020.9 and
 above (for example, [plantuml.com](https://plantuml.com)), set the `PLANTUML_ENCODING`
 environment variable to enable the `deflate` compression. On Omnibus,
 this can be done set in `/etc/gitlab.rb`:
diff --git a/doc/administration/integration/terminal.md b/doc/administration/integration/terminal.md
index bc5816ce120..fd9e09dc17a 100644
--- a/doc/administration/integration/terminal.md
+++ b/doc/administration/integration/terminal.md
@@ -45,7 +45,8 @@ detail below.
 
 ## Enabling and disabling terminal support
 
-NOTE: **Note:** AWS Elastic Load Balancers (ELBs) do not support web sockets.
+NOTE: **Note:**
+AWS Elastic Load Balancers (ELBs) do not support web sockets.
 AWS Application Load Balancers (ALBs) must be used if you want web terminals
 to work. See [AWS Elastic Load Balancing Product Comparison](https://aws.amazon.com/elasticloadbalancing/features/#compare)
 for more information.
diff --git a/doc/administration/job_artifacts.md b/doc/administration/job_artifacts.md
index 23fd424841e..cb31a8934b1 100644
--- a/doc/administration/job_artifacts.md
+++ b/doc/administration/job_artifacts.md
@@ -106,7 +106,8 @@ If you configure GitLab to store CI logs and artifacts on object storage, you mu
 
 #### Object Storage Settings
 
-NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
+NOTE: **Note:**
+In GitLab 13.2 and later, we recommend using the
 [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration).
 This section describes the earlier configuration format.
 
@@ -163,7 +164,7 @@ _The artifacts are stored by default in
    gitlab-rake gitlab:artifacts:migrate
    ```
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 JUnit test report artifact (`junit.xml.gz`) migration
 [is not supported](https://gitlab.com/gitlab-org/gitlab/-/issues/27698)
 by the `gitlab:artifacts:migrate` script.
@@ -196,7 +197,7 @@ _The artifacts are stored by default in
    sudo -u git -H bundle exec rake gitlab:artifacts:migrate RAILS_ENV=production
    ```
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 JUnit test report artifact (`junit.xml.gz`) migration
 [is not supported](https://gitlab.com/gitlab-org/gitlab/-/issues/27698)
 by the `gitlab:artifacts:migrate` script.
@@ -434,7 +435,7 @@ the number you want.
 
 #### Delete job artifacts from jobs completed before a specific date
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 These commands remove data permanently from the database and from disk. We
 highly recommend running them only under the guidance of a Support Engineer, or
 running them in a test environment with a backup of the instance ready to be
@@ -460,7 +461,7 @@ If you need to manually remove job artifacts associated with multiple jobs while
 
 1. Delete job artifacts older than a specific date:
 
-   NOTE: **NOTE:**
+   NOTE: **Note:**
    This step will also erase artifacts that users have chosen to
    ["keep"](../ci/pipelines/job_artifacts.md#browsing-artifacts).
 
@@ -481,7 +482,7 @@ If you need to manually remove job artifacts associated with multiple jobs while
 
 #### Delete job artifacts and logs from jobs completed before a specific date
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 These commands remove data permanently from the database and from disk. We
 highly recommend running them only under the guidance of a Support Engineer, or
 running them in a test environment with a backup of the instance ready to be
diff --git a/doc/administration/job_logs.md b/doc/administration/job_logs.md
index d3484536a76..4dba33b796a 100644
--- a/doc/administration/job_logs.md
+++ b/doc/administration/job_logs.md
@@ -73,7 +73,7 @@ job output in the UI will be empty.
 
 For example, to delete all job logs older than 60 days, run the following from a shell in your GitLab instance:
 
-DANGER: **Warning:**
+DANGER: **Danger:**
 This command will permanently delete the log files and is irreversible.
 
 ```shell
diff --git a/doc/administration/lfs/index.md b/doc/administration/lfs/index.md
index 460a1e1a5c7..4a8151bd091 100644
--- a/doc/administration/lfs/index.md
+++ b/doc/administration/lfs/index.md
@@ -63,7 +63,8 @@ GitLab provides two different options for the uploading mechanism: "Direct uploa
 
 [Read more about using object storage with GitLab](../object_storage.md).
 
-NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
+NOTE: **Note:**
+In GitLab 13.2 and later, we recommend using the
 [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration).
 This section describes the earlier configuration format.
 
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index 140f6cd6f0a..3db9d32563e 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -112,7 +112,8 @@ The ActionCable connection or channel class is used as the `controller`.
 }
 ```
 
-NOTE: **Note:** Starting with GitLab 12.5, if an error occurs, an
+NOTE: **Note:**
+Starting with GitLab 12.5, if an error occurs, an
 `exception` field is included with `class`, `message`, and
 `backtrace`. Previous versions included an `error` field instead of
 `exception.class` and `exception.message`. For example:
diff --git a/doc/administration/merge_request_diffs.md b/doc/administration/merge_request_diffs.md
index 3c4e239d137..93cdbff6621 100644
--- a/doc/administration/merge_request_diffs.md
+++ b/doc/administration/merge_request_diffs.md
@@ -72,7 +72,8 @@ be configured already.
 
 ## Object Storage Settings
 
-NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
+NOTE: **Note:**
+In GitLab 13.2 and later, we recommend using the
 [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration).
 This section describes the earlier configuration format.
 
diff --git a/doc/administration/object_storage.md b/doc/administration/object_storage.md
index 770bef3f331..b51b722fbd7 100644
--- a/doc/administration/object_storage.md
+++ b/doc/administration/object_storage.md
@@ -44,13 +44,15 @@ Using the consolidated object storage configuration has a number of advantages:
 - It enables the use of [encrypted S3 buckets](#encrypted-s3-buckets).
 - It [uploads files to S3 with proper `Content-MD5` headers](https://gitlab.com/gitlab-org/gitlab-workhorse/-/issues/222).
 
-NOTE: **Note:** Only AWS S3-compatible providers and Google are
+NOTE: **Note:**
+Only AWS S3-compatible providers and Google are
 supported at the moment since [direct upload
 mode](../development/uploads.md#direct-upload) must be used. Background
 upload is not supported in this mode. We recommend direct upload mode because
 it does not require a shared folder, and [this setting may become the default](https://gitlab.com/gitlab-org/gitlab/-/issues/27331).
 
-NOTE: **Note:** Consolidated object storage configuration cannot be used for
+NOTE: **Note:**
+Consolidated object storage configuration cannot be used for
 backups or Mattermost. See [the full table for a complete list](#storage-specific-configuration).
 
 Most types of objects, such as CI artifacts, LFS files, upload
@@ -253,7 +255,8 @@ gitlab_rails['object_store']['connection'] = {
 
 #### OpenStack-compatible connection settings
 
-NOTE: **Note:** This is not compatible with the consolidated object storage form.
+NOTE: **Note:**
+This is not compatible with the consolidated object storage form.
 OpenStack Swift is only supported with the storage-specific form. See the
 [S3 settings](#s3-compatible-connection-settings) if you want to use the consolidated form.
 
@@ -274,7 +277,8 @@ Here are the valid connection settings below for the Swift API, provided by
 
 #### Rackspace Cloud Files
 
-NOTE: **Note:** This is not compatible with the consolidated object
+NOTE: **Note:**
+This is not compatible with the consolidated object
 storage form. Rackspace Cloud is only supported with the storage-specific form.
 
 Here are the valid connection parameters for Rackspace Cloud, provided by
@@ -408,7 +412,8 @@ additional complexity and unnecessary redundancy. Since both GitLab
 Rails and Workhorse components need access to object storage, the
 consolidated form avoids excessive duplication of credentials.
 
-NOTE: **Note:** The consolidated object storage configuration is **only** used if all
+NOTE: **Note:**
+The consolidated object storage configuration is **only** used if all
 lines from the original form is omitted. To move to the consolidated form, remove the original configuration (for example, `artifacts_object_store_enabled`, `uploads_object_store_connection`, and so on.)
 
 ## Storage-specific configuration
diff --git a/doc/administration/operations/fast_ssh_key_lookup.md b/doc/administration/operations/fast_ssh_key_lookup.md
index 0d5c845aea0..b874a4257f0 100644
--- a/doc/administration/operations/fast_ssh_key_lookup.md
+++ b/doc/administration/operations/fast_ssh_key_lookup.md
@@ -3,7 +3,8 @@
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1631) in [GitLab Starter](https://about.gitlab.com/pricing/) 9.3.
 > - [Available in](https://gitlab.com/gitlab-org/gitlab/-/issues/3953) GitLab Community Edition 10.4.
 
-NOTE: **Note:** This document describes a drop-in replacement for the
+NOTE: **Note:**
+This document describes a drop-in replacement for the
 `authorized_keys` file. For normal (non-deploy key) users, consider using
 [SSH certificates](ssh_certificates.md). They are even faster, but are not a
 drop-in replacement.
@@ -73,16 +74,19 @@ Confirm that SSH is working by commenting out your user's key in the `authorized
 A successful pull would mean that GitLab was able to find the key in the database,
 since it is not present in the file anymore.
 
-NOTE: **Note:** For Omnibus Docker, `AuthorizedKeysCommand` is setup by default in
+NOTE: **Note:**
+For Omnibus Docker, `AuthorizedKeysCommand` is setup by default in
 GitLab 11.11 and later.
 
-NOTE: **Note:** For Installations from source, the command would be located at
+NOTE: **Note:**
+For Installations from source, the command would be located at
 `/home/git/gitlab-shell/bin/gitlab-shell-authorized-keys-check` if [the install from source](../../install/installation.md#install-gitlab-shell) instructions were followed.
 You might want to consider creating a wrapper script somewhere else since this command needs to be
 owned by `root` and not be writable by group or others. You could also consider changing the ownership of this command
 as required, but that might require temporary ownership changes during `gitlab-shell` upgrades.
 
-CAUTION: **Caution:** Do not disable writes until SSH is confirmed to be working
+CAUTION: **Caution:**
+Do not disable writes until SSH is confirmed to be working
 perfectly, because the file will quickly become out-of-date.
 
 In the case of lookup failures (which are common), the `authorized_keys`
diff --git a/doc/administration/operations/filesystem_benchmarking.md b/doc/administration/operations/filesystem_benchmarking.md
index c5c5a8b4313..856061348ed 100644
--- a/doc/administration/operations/filesystem_benchmarking.md
+++ b/doc/administration/operations/filesystem_benchmarking.md
@@ -65,7 +65,8 @@ operations per second.
 
 ### Simple benchmarking
 
-NOTE: **Note:** This test is naive but may be useful if `fio` is not
+NOTE: **Note:**
+This test is naive but may be useful if `fio` is not
 available on the system. It's possible to receive good results on this
 test but still have poor performance due to read speed and various other
 factors.
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index fd3e77555fd..6e861ca6a66 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -344,7 +344,8 @@ This path is accessible to:
 - The user running the Container Registry daemon.
 - The user running GitLab.
 
-CAUTION: **Warning:** You should confirm that all GitLab, Registry and web server users
+CAUTION: **Warning:**
+You should confirm that all GitLab, Registry and web server users
 have access to this directory.
 
 **Omnibus GitLab installations**
@@ -382,7 +383,8 @@ driver for the Container Registry.
 
 [Read more about using object storage with GitLab](../object_storage.md).
 
-CAUTION: **Warning:** GitLab will not backup Docker images that are not stored on the
+CAUTION: **Warning:**
+GitLab will not backup Docker images that are not stored on the
 filesystem. Remember to enable backups with your object storage provider if
 desired.
 
diff --git a/doc/administration/packages/dependency_proxy.md b/doc/administration/packages/dependency_proxy.md
index dc76f4f7869..2f9cfecc9d4 100644
--- a/doc/administration/packages/dependency_proxy.md
+++ b/doc/administration/packages/dependency_proxy.md
@@ -87,7 +87,8 @@ store the blobs of the dependency proxy.
 
 [Read more about using object storage with GitLab](../object_storage.md).
 
-NOTE: **Note:** In GitLab 13.2 and later, we recommend using the
+NOTE: **Note:**
+In GitLab 13.2 and later, we recommend using the
 [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration).
 This section describes the earlier configuration format.
 
diff --git a/doc/administration/packages/index.md b/doc/administration/packages/index.md
index 2428e5b90e2..5d07136ef40 100644
--- a/doc/administration/packages/index.md
+++ b/doc/administration/packages/index.md
@@ -99,7 +99,8 @@ store packages.
 
 [Read more about using object storage with GitLab](../object_storage.md).
 
-NOTE: **Note:** We recommend using the [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration). The following instructions apply to the original config format.
+NOTE: **Note:**
+We recommend using the [consolidated object storage settings](../object_storage.md#consolidated-object-storage-configuration). The following instructions apply to the original config format.
 
 **Omnibus GitLab installations**
 
diff --git a/doc/administration/postgresql/replication_and_failover.md b/doc/administration/postgresql/replication_and_failover.md
index 29311aaf539..5f550f09e5b 100644
--- a/doc/administration/postgresql/replication_and_failover.md
+++ b/doc/administration/postgresql/replication_and_failover.md
@@ -966,7 +966,8 @@ after it has been restored to service.
   gitlab-ctl restart repmgrd
   ```
 
-  CAUTION: **Warning:** When the server is brought back online, and before
+  CAUTION: **Warning:**
+  When the server is brought back online, and before
   you switch it to a standby node, repmgr will report that there are two masters.
   If there are any clients that are still attempting to write to the old master,
   this will cause a split, and the old master will need to be resynced from
@@ -1129,7 +1130,8 @@ If you're running into an issue with a component not outlined here, be sure to c
 
 ## Patroni
 
-NOTE: **Note:** Starting from GitLab 13.1, Patroni is available for **experimental** use to replace repmgr. Due to its
+NOTE: **Note:**
+Starting from GitLab 13.1, Patroni is available for **experimental** use to replace repmgr. Due to its
 experimental nature, Patroni support is **subject to change without notice.**
 
 Patroni is an opinionated solution for PostgreSQL high-availability. It takes the control of PostgreSQL, overrides its
@@ -1320,7 +1322,8 @@ You can switch an exiting database cluster to use Patroni instead of repmgr with
    sudo gitlab-ctl stop postgresql
    ```
 
-   NOTE: **Note:**  Ensure that there is no `walsender` process running on the primary node.
+   NOTE: **Note:**
+   Ensure that there is no `walsender` process running on the primary node.
    `ps aux | grep walsender` must not show any running process.  
 
 1. On the primary node, [configure Patroni](#configuring-patroni-cluster). Remove `repmgr` and any other
diff --git a/doc/administration/postgresql/standalone.md b/doc/administration/postgresql/standalone.md
index 3e7826ce009..2747749066e 100644
--- a/doc/administration/postgresql/standalone.md
+++ b/doc/administration/postgresql/standalone.md
@@ -53,7 +53,8 @@ together with Omnibus GitLab. This is recommended as part of our
    gitlab_rails['auto_migrate'] = false
    ```
 
-   NOTE: **Note:** The role `postgres_role` was introduced with GitLab 10.3
+   NOTE: **Note:**
+   The role `postgres_role` was introduced with GitLab 10.3
 
 1. [Reconfigure GitLab](../restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 1. Note the PostgreSQL node's IP address or hostname, port, and
diff --git a/doc/administration/raketasks/ldap.md b/doc/administration/raketasks/ldap.md
index d168e3d568c..30bb9828aa0 100644
--- a/doc/administration/raketasks/ldap.md
+++ b/doc/administration/raketasks/ldap.md
@@ -36,7 +36,7 @@ The following task will run a [group sync](../auth/ldap/index.md#group-sync-star
 when you'd like to update all configured group memberships against LDAP without
 waiting for the next scheduled group sync to be run.
 
-NOTE: **NOTE:**
+NOTE: **Note:**
 If you'd like to change the frequency at which a group sync is performed,
 [adjust the cron schedule](../auth/ldap/index.md#adjusting-ldap-group-sync-schedule-starter-only)
 instead.
diff --git a/doc/administration/raketasks/maintenance.md b/doc/administration/raketasks/maintenance.md
index 11a0bfb545d..19781b6a5db 100644
--- a/doc/administration/raketasks/maintenance.md
+++ b/doc/administration/raketasks/maintenance.md
@@ -260,7 +260,7 @@ clear it.
 
 To clear all exclusive leases:
 
-DANGER: **DANGER**:
+DANGER: **Danger:**
 Don't run it while GitLab or Sidekiq is running
 
 ```shell
diff --git a/doc/administration/redis/replication_and_failover.md b/doc/administration/redis/replication_and_failover.md
index d95320b6669..ac31b909c89 100644
--- a/doc/administration/redis/replication_and_failover.md
+++ b/doc/administration/redis/replication_and_failover.md
@@ -339,7 +339,8 @@ the same Sentinels.
 
 ### Step 3. Configuring the Redis Sentinel instances
 
-NOTE: **Note:** If you are using an external Redis Sentinel instance, be sure
+NOTE: **Note:**
+If you are using an external Redis Sentinel instance, be sure
 to exclude the `requirepass` parameter from the Sentinel
 configuration. This parameter will cause clients to report `NOAUTH
 Authentication required.`. [Redis Sentinel 3.2.x does not support
diff --git a/doc/administration/reference_architectures/2k_users.md b/doc/administration/reference_architectures/2k_users.md
index c317cd24094..d182daf45b3 100644
--- a/doc/administration/reference_architectures/2k_users.md
+++ b/doc/administration/reference_architectures/2k_users.md
@@ -658,7 +658,8 @@ On each node perform the following:
    sudo gitlab-ctl tail gitaly
    ```
 
-NOTE: **Note:** When you specify `https` in the `external_url`, as in the example
+NOTE: **Note:**
+When you specify `https` in the `external_url`, as in the example
 above, GitLab assumes you have SSL certificates in `/etc/gitlab/ssl/`. If
 certificates are not present, NGINX will fail to start. See the
 [NGINX documentation](https://docs.gitlab.com/omnibus/settings/nginx.html#enable-https)
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index b81855b9451..c6fb98ea227 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -4,7 +4,8 @@ This page describes GitLab reference architecture for up to 3,000 users.
 For a full list of reference architectures, see
 [Available reference architectures](index.md#available-reference-architectures).
 
-NOTE: **Note:** The 3,000-user reference architecture documented below is
+NOTE: **Note:**
+The 3,000-user reference architecture documented below is
 designed to help your organization achieve a highly-available GitLab deployment.
 If you do not have the expertise or need to maintain a highly-available
 environment, you can have a simpler and less costly-to-operate environment by
diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md
index 1275379a7e0..8fde71a66bf 100644
--- a/doc/administration/reference_architectures/index.md
+++ b/doc/administration/reference_architectures/index.md
@@ -38,7 +38,8 @@ When scaling GitLab, there are several factors to consider:
 - A load balancer is added in front to distribute traffic across the application nodes.
 - The application nodes connects to a shared file server and PostgreSQL and Redis services on the backend.
 
-NOTE: **Note:** Depending on your workflow, the following recommended
+NOTE: **Note:**
+Depending on your workflow, the following recommended
 reference architectures may need to be adapted accordingly. Your workload
 is influenced by factors including how active your users are,
 how much automation you use, mirroring, and repository/change size. Additionally the
diff --git a/doc/administration/repository_storage_paths.md b/doc/administration/repository_storage_paths.md
index b682c064b70..f00c96952ac 100644
--- a/doc/administration/repository_storage_paths.md
+++ b/doc/administration/repository_storage_paths.md
@@ -60,7 +60,8 @@ files and add the full paths of the alternative repository storage paths. In
 the example below, we add two more mount points that are named `nfs_1` and `nfs_2`
 respectively.
 
-NOTE: **Note:** This example uses NFS. We do not recommend using EFS for storage as it may impact GitLab's performance. See the [relevant documentation](high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
+NOTE: **Note:**
+This example uses NFS. We do not recommend using EFS for storage as it may impact GitLab's performance. See the [relevant documentation](high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
 
 **For installations from source**
 
diff --git a/doc/administration/smime_signing_email.md b/doc/administration/smime_signing_email.md
index bab7c5c260d..304b65917c1 100644
--- a/doc/administration/smime_signing_email.md
+++ b/doc/administration/smime_signing_email.md
@@ -21,7 +21,8 @@ files must be provided:
 Optionally, you can also provide a bundle of CA certs (PEM-encoded) to be
 included on each signature. This will typically be an intermediate CA.
 
-NOTE: **Note:** Be mindful of the access levels for your private keys and visibility to
+NOTE: **Note:**
+Be mindful of the access levels for your private keys and visibility to
 third parties.
 
 **For Omnibus installations:**
@@ -38,7 +39,8 @@ third parties.
 
 1. Save the file and [reconfigure GitLab](restart_gitlab.md#omnibus-gitlab-reconfigure) for the changes to take effect.
 
-NOTE: **Note:** The key needs to be readable by the GitLab system user (`git` by default).
+NOTE: **Note:**
+The key needs to be readable by the GitLab system user (`git` by default).
 
 **For installations from source:**
 
@@ -61,7 +63,8 @@ NOTE: **Note:** The key needs to be readable by the GitLab system user (`git` by
 
 1. Save the file and [restart GitLab](restart_gitlab.md#installations-from-source) for the changes to take effect.
 
-NOTE: **Note:** The key needs to be readable by the GitLab system user (`git` by default).
+NOTE: **Note:**
+The key needs to be readable by the GitLab system user (`git` by default).
 
 ### How to convert S/MIME PKCS#12 / PFX format to PEM encoding
 
diff --git a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
index 640a3e6746e..8e9749fb239 100644
--- a/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
+++ b/doc/administration/troubleshooting/gitlab_rails_cheat_sheet.md
@@ -11,13 +11,13 @@ having an issue with GitLab, it is highly recommended that you check your
 [support options](https://about.gitlab.com/support/) first, before attempting to use
 this information.
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 Please note that some of these scripts could be damaging if not run correctly,
 or under the right conditions. We highly recommend running them under the
 guidance of a Support Engineer, or running them in a test environment with a
 backup of the instance ready to be restored, just in case.
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 Please also note that as GitLab changes, changes to the code are inevitable,
 and so some scripts may not work as they once used to. These are not kept
 up-to-date as these scripts/commands were added as they were found/needed. As
diff --git a/doc/administration/troubleshooting/linux_cheat_sheet.md b/doc/administration/troubleshooting/linux_cheat_sheet.md
index 7af4219caa3..06c49d67f40 100644
--- a/doc/administration/troubleshooting/linux_cheat_sheet.md
+++ b/doc/administration/troubleshooting/linux_cheat_sheet.md
@@ -10,7 +10,7 @@ and it may be useful for users with experience with Linux. If you are currently
 having an issue with GitLab, you may want to check your [support options](https://about.gitlab.com/support/)
 first, before attempting to use this information.
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 If you are administering GitLab you are expected to know these commands for your distribution
 of choice. If you are a GitLab Support Engineer, consider this a cross-reference to
 translate `yum` -> `apt-get` and the like.
diff --git a/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md b/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md
index 4628c63b57f..571973c12d9 100644
--- a/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md
+++ b/doc/administration/troubleshooting/navigating_gitlab_via_rails_console.md
@@ -6,7 +6,7 @@ Thanks to this, we also get access to the amazing tools built right into Rails.
 In this guide, we'll introduce the [Rails console](debug.md#starting-a-rails-console-session)
 and the basics of interacting with your GitLab instance from the command line.
 
-CAUTION: **CAUTION:**
+CAUTION: **Caution:**
 The Rails console interacts directly with your GitLab instance. In many cases,
 there are no handrails to prevent you from permanently modifying, corrupting
 or destroying production data. If you would like to explore the Rails console
diff --git a/doc/administration/troubleshooting/postgresql.md b/doc/administration/troubleshooting/postgresql.md
index 6dfc1197161..36c1f20818a 100644
--- a/doc/administration/troubleshooting/postgresql.md
+++ b/doc/administration/troubleshooting/postgresql.md
@@ -8,7 +8,8 @@ This page is useful information about PostgreSQL that the GitLab Support
 Team sometimes uses while troubleshooting. GitLab is making this public, so that anyone
 can make use of the Support team's collected knowledge.
 
-CAUTION: **Caution:** Some procedures documented here may break your GitLab instance. Use at your own risk.
+CAUTION: **Caution:**
+Some procedures documented here may break your GitLab instance. Use at your own risk.
 
 If you are on a [paid tier](https://about.gitlab.com/pricing/) and are not sure how
 to use these commands, it is best to [contact Support](https://about.gitlab.com/support/)
@@ -115,7 +116,8 @@ Quoting from issue [#1](https://gitlab.com/gitlab-org/gitlab/-/issues/30528):
 
 > "If a deadlock is hit, and we resolve it through aborting the transaction after a short period, then the retry mechanisms we already have will make the deadlocked piece of work try again, and it's unlikely we'll deadlock multiple times in a row."
 
-TIP: **Tip:** In support, our general approach to reconfiguring timeouts (applies also to the HTTP stack as well) is that it's acceptable to do it temporarily as a workaround. If it makes GitLab usable for the customer, then it buys time to understand the problem more completely, implement a hot fix, or make some other change that addresses the root cause. Generally, the timeouts should be put back to reasonable defaults once the root cause is resolved.
+TIP: **Tip:**
+In support, our general approach to reconfiguring timeouts (applies also to the HTTP stack as well) is that it's acceptable to do it temporarily as a workaround. If it makes GitLab usable for the customer, then it buys time to understand the problem more completely, implement a hot fix, or make some other change that addresses the root cause. Generally, the timeouts should be put back to reasonable defaults once the root cause is resolved.
 
 In this case, the guidance we had from development was to drop deadlock_timeout and/or statement_timeout but to leave the third setting at 60s. Setting idle_in_transaction protects the database from sessions potentially hanging for days. There's more discussion in [the issue relating to introducing this timeout on GitLab.com](https://gitlab.com/gitlab-com/gl-infra/production/-/issues/1053).
 
diff --git a/doc/administration/troubleshooting/sidekiq.md b/doc/administration/troubleshooting/sidekiq.md
index 6ecb8a06f1d..566e2686735 100644
--- a/doc/administration/troubleshooting/sidekiq.md
+++ b/doc/administration/troubleshooting/sidekiq.md
@@ -283,7 +283,8 @@ queue = Sidekiq::Queue.new('<queue name>')
 queue.each { |job| job.delete if <condition>}
 ```
 
-NOTE: **Note:** This will remove jobs that are queued but not started, running jobs will not be killed. Have a look at the section below for cancelling running jobs.
+NOTE: **Note:**
+This will remove jobs that are queued but not started, running jobs will not be killed. Have a look at the section below for cancelling running jobs.
 
 In the method above, `<queue-name>` is the name of the queue that contains the job(s) you want to delete and `<condition>` will decide which jobs get deleted.
 
diff --git a/doc/administration/uploads.md b/doc/administration/uploads.md
index 72fd0cd1c60..d9902208e93 100644
--- a/doc/administration/uploads.md
+++ b/doc/administration/uploads.md
@@ -57,7 +57,8 @@ This configuration relies on valid AWS credentials to be configured already.
 
 [Read more about using object storage with GitLab](object_storage.md).
 
-NOTE: **Note:** We recommend using the [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration). The following instructions apply to the original config format.
+NOTE: **Note:**
+We recommend using the [consolidated object storage settings](object_storage.md#consolidated-object-storage-configuration). The following instructions apply to the original config format.
 
 ## Object Storage Settings
 
diff --git a/doc/api/epics.md b/doc/api/epics.md
index f2c3796f20c..fcdbb8cea71 100644
--- a/doc/api/epics.md
+++ b/doc/api/epics.md
@@ -38,7 +38,7 @@ are paginated.
 
 Read more on [pagination](README.md#pagination).
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 > `reference` attribute in response is deprecated in favour of `references`.
 > Introduced [GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20354)
 
diff --git a/doc/api/feature_flag_specs.md b/doc/api/feature_flag_specs.md
index ef0d1b1ec14..eaa6ea36c23 100644
--- a/doc/api/feature_flag_specs.md
+++ b/doc/api/feature_flag_specs.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9566) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.5.
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 This API is deprecated and [scheduled for removal in GitLab 14.0](https://gitlab.com/gitlab-org/gitlab/-/issues/213369).
 
 The API for creating, updating, reading and deleting Feature Flag Specs.
diff --git a/doc/api/feature_flags_legacy.md b/doc/api/feature_flags_legacy.md
index 648f63f6f07..7e4fc47a1de 100644
--- a/doc/api/feature_flags_legacy.md
+++ b/doc/api/feature_flags_legacy.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9566) in [GitLab Premium](https://about.gitlab.com/pricing/) 12.5.
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 This API is deprecated and [scheduled for removal in GitLab 14.0](https://gitlab.com/gitlab-org/gitlab/-/issues/213369). Use [this API](feature_flags.md) instead.
 
 API for accessing resources of [GitLab Feature Flags](../operations/feature_flags.md).
diff --git a/doc/api/graphql/reference/gitlab_schema.graphql b/doc/api/graphql/reference/gitlab_schema.graphql
index 5c894ebbef8..d0d68a403eb 100644
--- a/doc/api/graphql/reference/gitlab_schema.graphql
+++ b/doc/api/graphql/reference/gitlab_schema.graphql
@@ -4370,6 +4370,11 @@ type EpicIssue implements Noteable {
 The connection type for EpicIssue.
 """
 type EpicIssueConnection {
+  """
+  Total count of collection
+  """
+  count: Int!
+
   """
   A list of edges.
   """
@@ -5043,6 +5048,11 @@ type Group {
     """
     iids: [String!]
 
+    """
+    Iterations applied to the issue
+    """
+    iterationId: [ID]
+
     """
     Labels applied to this issue
     """
@@ -5967,6 +5977,11 @@ type Issue implements Noteable {
 The connection type for Issue.
 """
 type IssueConnection {
+  """
+  Total count of collection
+  """
+  count: Int!
+
   """
   A list of edges.
   """
@@ -9199,6 +9214,11 @@ type Project {
     """
     iids: [String!]
 
+    """
+    Iterations applied to the issue
+    """
+    iterationId: [ID]
+
     """
     Labels applied to this issue
     """
@@ -9294,6 +9314,11 @@ type Project {
     """
     iids: [String!]
 
+    """
+    Iterations applied to the issue
+    """
+    iterationId: [ID]
+
     """
     Labels applied to this issue
     """
diff --git a/doc/api/graphql/reference/gitlab_schema.json b/doc/api/graphql/reference/gitlab_schema.json
index 088ab8bf418..02394f89ed1 100644
--- a/doc/api/graphql/reference/gitlab_schema.json
+++ b/doc/api/graphql/reference/gitlab_schema.json
@@ -12216,6 +12216,24 @@
           "name": "EpicIssueConnection",
           "description": "The connection type for EpicIssue.",
           "fields": [
+            {
+              "name": "count",
+              "description": "Total count of collection",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "edges",
               "description": "A list of edges.",
@@ -14041,6 +14059,20 @@
                   },
                   "defaultValue": "created_desc"
                 },
+                {
+                  "name": "iterationId",
+                  "description": "Iterations applied to the issue",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "ID",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
@@ -16428,6 +16460,24 @@
           "name": "IssueConnection",
           "description": "The connection type for Issue.",
           "fields": [
+            {
+              "name": "count",
+              "description": "Total count of collection",
+              "args": [
+
+              ],
+              "type": {
+                "kind": "NON_NULL",
+                "name": null,
+                "ofType": {
+                  "kind": "SCALAR",
+                  "name": "Int",
+                  "ofType": null
+                }
+              },
+              "isDeprecated": false,
+              "deprecationReason": null
+            },
             {
               "name": "edges",
               "description": "A list of edges.",
@@ -27439,6 +27489,20 @@
                     "ofType": null
                   },
                   "defaultValue": "created_desc"
+                },
+                {
+                  "name": "iterationId",
+                  "description": "Iterations applied to the issue",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "ID",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
                 }
               ],
               "type": {
@@ -27619,6 +27683,20 @@
                   },
                   "defaultValue": "created_desc"
                 },
+                {
+                  "name": "iterationId",
+                  "description": "Iterations applied to the issue",
+                  "type": {
+                    "kind": "LIST",
+                    "name": null,
+                    "ofType": {
+                      "kind": "SCALAR",
+                      "name": "ID",
+                      "ofType": null
+                    }
+                  },
+                  "defaultValue": null
+                },
                 {
                   "name": "after",
                   "description": "Returns the elements in the list that come after the specified cursor.",
diff --git a/doc/api/group_labels.md b/doc/api/group_labels.md
index 5ae5ea4286a..260ee669e08 100644
--- a/doc/api/group_labels.md
+++ b/doc/api/group_labels.md
@@ -170,7 +170,8 @@ Example response:
 }
 ```
 
-NOTE: **Note:** An older endpoint `PUT /groups/:id/labels` with `name` in the parameters is still available, but deprecated.
+NOTE: **Note:**
+An older endpoint `PUT /groups/:id/labels` with `name` in the parameters is still available, but deprecated.
 
 ## Delete a group label
 
@@ -189,7 +190,8 @@ DELETE /groups/:id/labels/:label_id
 curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/5/labels/bug"
 ```
 
-NOTE: **Note:** An older endpoint `DELETE /groups/:id/labels` with `name` in the parameters is still available, but deprecated.
+NOTE: **Note:**
+An older endpoint `DELETE /groups/:id/labels` with `name` in the parameters is still available, but deprecated.
 
 ## Subscribe to a group label
 
diff --git a/doc/api/issues.md b/doc/api/issues.md
index a4555b2a712..22f5d994f85 100644
--- a/doc/api/issues.md
+++ b/doc/api/issues.md
@@ -16,7 +16,7 @@ are paginated.
 
 Read more on [pagination](README.md#pagination).
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 > `reference` attribute in response is deprecated in favour of `references`.
 > Introduced [GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20354)
 
diff --git a/doc/api/labels.md b/doc/api/labels.md
index 3ab059fca7c..30290f18653 100644
--- a/doc/api/labels.md
+++ b/doc/api/labels.md
@@ -199,7 +199,8 @@ DELETE /projects/:id/labels/:label_id
 curl --request DELETE --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/1/labels/bug"
 ```
 
-NOTE: **Note:** An older endpoint `DELETE /projects/:id/labels` with `name` in the parameters is still available, but deprecated.
+NOTE: **Note:**
+An older endpoint `DELETE /projects/:id/labels` with `name` in the parameters is still available, but deprecated.
 
 ## Edit an existing label
 
@@ -242,7 +243,8 @@ Example response:
 }
 ```
 
-NOTE: **Note:** An older endpoint `PUT /projects/:id/labels` with `name` or `label_id` in the parameters is still available, but deprecated.
+NOTE: **Note:**
+An older endpoint `PUT /projects/:id/labels` with `name` or `label_id` in the parameters is still available, but deprecated.
 
 ## Promote a project label to a group label
 
@@ -279,7 +281,8 @@ Example response:
 }
 ```
 
-NOTE: **Note:** An older endpoint `PUT /projects/:id/labels/promote` with `name` in the parameters is still available, but deprecated.
+NOTE: **Note:**
+An older endpoint `PUT /projects/:id/labels/promote` with `name` in the parameters is still available, but deprecated.
 
 ## Subscribe to a label
 
diff --git a/doc/api/merge_requests.md b/doc/api/merge_requests.md
index 2ec399fc507..070d21d99aa 100644
--- a/doc/api/merge_requests.md
+++ b/doc/api/merge_requests.md
@@ -2,7 +2,7 @@
 
 Every API call to merge requests must be authenticated.
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 > `reference` attribute in response is deprecated in favour of `references`.
 > Introduced [GitLab 12.6](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/20354)
 
diff --git a/doc/api/namespaces.md b/doc/api/namespaces.md
index d1a2812bfb4..e38e725fb97 100644
--- a/doc/api/namespaces.md
+++ b/doc/api/namespaces.md
@@ -68,7 +68,8 @@ the `plan` parameter associated with a namespace:
 ]
 ```
 
-NOTE: **Note:** Only group maintainers/owners are presented with `members_count_with_descendants`, as well as `plan` **(BRONZE ONLY)**.
+NOTE: **Note:**
+Only group maintainers/owners are presented with `members_count_with_descendants`, as well as `plan` **(BRONZE ONLY)**.
 
 ## Search for namespace
 
diff --git a/doc/api/packages.md b/doc/api/packages.md
index ca7113bc743..19828208a26 100644
--- a/doc/api/packages.md
+++ b/doc/api/packages.md
@@ -80,7 +80,7 @@ GET /groups/:id/packages
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/groups/:id/packages?exclude_subgroups=true"
 ```
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 > The `build_info` attribute in the response is deprecated in favour of `pipeline`.
 > Introduced [GitLab 12.10](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28040).
 
@@ -165,7 +165,7 @@ GET /projects/:id/packages/:package_id
 curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/api/v4/projects/:id/packages/:package_id"
 ```
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 > The `build_info` attribute in the response is deprecated in favour of `pipeline`.
 > Introduced [GitLab 12.10](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28040).
 
diff --git a/doc/api/projects.md b/doc/api/projects.md
index ea8f154b144..6464b1db06e 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -1087,7 +1087,8 @@ POST /projects
 | `group_with_project_templates_id` | integer | no | **(PREMIUM)** For group-level custom templates, specifies ID of group from which all the custom project templates are sourced. Leave empty for instance-level templates. Requires `use_custom_template` to be true |
 | `packages_enabled` | boolean | no | **(PREMIUM ONLY)** Enable or disable packages repository feature |
 
-NOTE: **Note:** If your HTTP repository is not publicly accessible,
+NOTE: **Note:**
+If your HTTP repository is not publicly accessible,
 add authentication information to the URL: `https://username:password@gitlab.company.com/group/project.git`
 where `password` is a public access key with the `api` scope enabled.
 
@@ -1157,7 +1158,8 @@ POST /projects/user/:user_id
 | `group_with_project_templates_id` | integer | no | **(PREMIUM)** For group-level custom templates, specifies ID of group from which all the custom project templates are sourced. Leave empty for instance-level templates. Requires `use_custom_template` to be true |
 | `packages_enabled` | boolean | no | **(PREMIUM ONLY)** Enable or disable packages repository feature |
 
-NOTE: **Note:** If your HTTP repository is not publicly accessible,
+NOTE: **Note:**
+If your HTTP repository is not publicly accessible,
 add authentication information to the URL: `https://username:password@gitlab.company.com/group/project.git`
 where `password` is a public access key with the `api` scope enabled.
 
@@ -1228,7 +1230,8 @@ PUT /projects/:id
 | `packages_enabled` | boolean | no | **(PREMIUM ONLY)** Enable or disable packages repository feature |
 | `service_desk_enabled` | boolean | no | **(PREMIUM ONLY)** Enable or disable service desk feature |
 
-NOTE: **Note:** If your HTTP repository is not publicly accessible,
+NOTE: **Note:**
+If your HTTP repository is not publicly accessible,
 add authentication information to the URL: `https://username:password@gitlab.company.com/group/project.git`
 where `password` is a public access key with the `api` scope enabled.
 
diff --git a/doc/api/users.md b/doc/api/users.md
index a6ae4f384aa..505468945cb 100644
--- a/doc/api/users.md
+++ b/doc/api/users.md
@@ -318,7 +318,8 @@ Example Responses:
 }
 ```
 
-NOTE: **Note:** The `plan` and `trial` parameters are only available on GitLab Enterprise Edition.
+NOTE: **Note:**
+The `plan` and `trial` parameters are only available on GitLab Enterprise Edition.
 
 Users on GitLab [Starter, Bronze, or higher](https://about.gitlab.com/pricing/) will also see
 the `shared_runners_minutes_limit`, and `extra_shared_runners_minutes_limit` parameters.
@@ -1412,7 +1413,8 @@ Parameters:
 
 ### Get user activities (admin only)
 
-NOTE: **Note:** This API endpoint is only available on 8.15 (EE) and 9.1 (CE) and above.
+NOTE: **Note:**
+This API endpoint is only available on 8.15 (EE) and 9.1 (CE) and above.
 
 Get the last activity date for all users, sorted from oldest to newest.
 
diff --git a/doc/ci/docker/using_docker_images.md b/doc/ci/docker/using_docker_images.md
index 0e81666cf63..735cf35584f 100644
--- a/doc/ci/docker/using_docker_images.md
+++ b/doc/ci/docker/using_docker_images.md
@@ -681,11 +681,13 @@ To add `DOCKER_AUTH_CONFIG` to a Runner:
 
 1. Restart the Runner service.
 
-NOTE: **Note:** The double quotes included in the `DOCKER_AUTH_CONFIG`
+NOTE: **Note:**
+The double quotes included in the `DOCKER_AUTH_CONFIG`
 data must be escaped with backslashes. This prevents them from being
 interpreted as TOML.
 
-NOTE: **Note:** The `environment` option is a list. So your Runner may
+NOTE: **Note:**
+The `environment` option is a list. So your Runner may
 have existing entries and you should add this to the list, not replace
 it.
 
@@ -715,7 +717,8 @@ To configure credentials store, follow these steps:
      `${GITLAB_RUNNER_HOME}/.docker/config.json`. GitLab Runner will read this configuration file
      and will use the needed helper for this specific repository.
 
-NOTE: **Note:** `credsStore` is used to access ALL the registries.
+NOTE: **Note:**
+`credsStore` is used to access ALL the registries.
 If you will want to use both images from private registry and public images from DockerHub,
 pulling from DockerHub will fail, because Docker daemon will try to use the same credentials for **ALL** the registries.
 
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index 896793a8ac1..0273ab290a6 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -124,7 +124,7 @@ The environment `name` and `url` is exposed in various places
 within GitLab. Each time a job that has an environment specified
 succeeds, a deployment is recorded, along with the Git SHA, and environment name.
 
-CAUTION: **Caution**:
+CAUTION: **Caution:**
 Some characters are not allowed in environment names. Use only letters,
 numbers, spaces, and `-`, `_`, `/`, `{`, `}`, or `.`. Also, it must not start nor end with `/`.
 
diff --git a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
index 41546be78f6..9a87786ec70 100644
--- a/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
+++ b/doc/ci/examples/authenticating-with-hashicorp-vault/index.md
@@ -60,7 +60,7 @@ To communicate with Vault, you can use either its CLI client or perform API requ
 
 ## Example
 
-CAUTION: **Caution**:
+CAUTION: **Caution:**
 JWTs are credentials, which can grant access to resources. Be careful where you paste them!
 
 Let's say you have the passwords for your staging and production databases stored in a Vault server that is running on `http://vault.example.com:8200`. Your staging password is `pa$$w0rd` and your production password is `real-pa$$w0rd`.
@@ -156,7 +156,7 @@ Combined with GitLab's [protected branches](../../../user/project/protected_bran
 
 For the full list of options, see Vault's [Create Role documentation](https://www.vaultproject.io/api/auth/jwt#create-role).
 
-CAUTION: **Caution**:
+CAUTION: **Caution:**
 Always restrict your roles to project or namespace by using one of the provided claims (e.g. `project_id` or `namespace_id`). Otherwise any JWT generated by this instance may be allowed to authenticate using this role.
 
 Now, configure the JWT Authentication method:
diff --git a/doc/ci/interactive_web_terminal/index.md b/doc/ci/interactive_web_terminal/index.md
index 385a9280202..c79fb5bc926 100644
--- a/doc/ci/interactive_web_terminal/index.md
+++ b/doc/ci/interactive_web_terminal/index.md
@@ -38,10 +38,12 @@ but support [is planned](https://gitlab.com/gitlab-org/charts/gitlab-runner/-/is
 
 ## Debugging a running job
 
-NOTE: **Note:** Not all executors are
+NOTE: **Note:**
+Not all executors are
 [supported](https://docs.gitlab.com/runner/executors/#compatibility-chart).
 
-NOTE: **Note:** The `docker` executor does not keep running
+NOTE: **Note:**
+The `docker` executor does not keep running
 after the build script is finished. At that point, the terminal will automatically
 disconnect and will not wait for the user to finish. Please follow [this
 issue](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/3605) for updates on
diff --git a/doc/ci/pipelines/job_artifacts.md b/doc/ci/pipelines/job_artifacts.md
index 1b6378c904d..3279d720bf0 100644
--- a/doc/ci/pipelines/job_artifacts.md
+++ b/doc/ci/pipelines/job_artifacts.md
@@ -419,7 +419,7 @@ information in the UI.
 
 ## Erasing artifacts
 
-DANGER: **Warning:**
+DANGER: **Danger:**
 This is a destructive action that leads to data loss. Use with caution.
 
 You can erase a single job via the UI, which will also remove the job's
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index fad7243462c..49ac2f85bc3 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -1181,7 +1181,7 @@ job:
 - If the pipeline is a scheduled pipeline, the job is **not** be added to the pipeline.
 - In **all other cases**, the job is added to the pipeline, with `when: on_success`.
 
-CAUTION: **Caution**
+CAUTION: **Caution:**
 If you use `when: on_success`, `always`, or `delayed` as the final rule, two
 simultaneous pipelines may start. Both push pipelines and merge request pipelines can
 be triggered by the same event (a push to the source branch for an open merge request).
@@ -1569,7 +1569,7 @@ and must be surrounded by `/`.
 So `issue-/.*/` won't work to match all tag names or branch names
 that begin with `issue-`.
 
-TIP: **Tip**
+TIP: **Tip:**
 Use anchors `^` and `$` to avoid the regular expression
 matching only a substring of the tag name or branch name.
 For example, `/^issue-.*$/` is equivalent to `/^issue-/`,
@@ -3921,7 +3921,8 @@ variables:
   GIT_STRATEGY: none
 ```
 
-NOTE: **Note:** `GIT_STRATEGY` is not supported for
+NOTE: **Note:**
+`GIT_STRATEGY` is not supported for
 [Kubernetes executor](https://docs.gitlab.com/runner/executors/kubernetes.html),
 but may be in the future. See the [support Git strategy with Kubernetes executor feature proposal](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/3847)
 for updates.
diff --git a/doc/development/api_graphql_styleguide.md b/doc/development/api_graphql_styleguide.md
index d0ea9994ef7..92e6add9f17 100644
--- a/doc/development/api_graphql_styleguide.md
+++ b/doc/development/api_graphql_styleguide.md
@@ -571,7 +571,8 @@ module Types
 end
 ```
 
-NOTE: **Note:** If the field's type already [has a particular
+NOTE: **Note:**
+If the field's type already [has a particular
 authorization](#type-authorization) then there is no need to add that
 same authorization to the field.
 
diff --git a/doc/development/application_limits.md b/doc/development/application_limits.md
index b5b0a4f13e8..4d296451add 100644
--- a/doc/development/application_limits.md
+++ b/doc/development/application_limits.md
@@ -27,7 +27,8 @@ limit values. It's recommended to create separate migration script files.
   add_column(:plan_limits, :project_hooks, :integer, default: 100, null: false)
   ```
 
-  NOTE: **Note:** Plan limits entries set to `0` mean that limits are not
+  NOTE: **Note:**
+  Plan limits entries set to `0` mean that limits are not
   enabled. You should use this setting only in special and documented circumstances.
 
 1. (Optionally) Create the database migration that fine-tunes each level with
@@ -57,7 +58,8 @@ limit values. It's recommended to create separate migration script files.
   end
   ```
 
-NOTE: **Note:** Some plans exist only on GitLab.com. This will be no-op
+NOTE: **Note:**
+Some plans exist only on GitLab.com. This will be no-op
 for plans that do not exist.
 
 ### Plan limits validation
@@ -95,7 +97,8 @@ can be used to validate that a model does not exceed the limits. It ensures
 that the count of the records for the current model does not exceed the defined
 limit.
 
-NOTE: **Note:** You must specify the limit scope of the object being validated
+NOTE: **Note:**
+You must specify the limit scope of the object being validated
 and the limit name if it's different from the pluralized model name.
 
 ```ruby
@@ -143,4 +146,5 @@ GitLab.com:
 - `silver` - Namespaces and projects with a Silver subscription
 - `gold` - Namespaces and projects with a Gold subscription
 
-NOTE: **Note:** The test environment doesn't have any plans.
+NOTE: **Note:**
+The test environment doesn't have any plans.
diff --git a/doc/development/chatops_on_gitlabcom.md b/doc/development/chatops_on_gitlabcom.md
index 33c5e7ed3ce..a3a4f1d7adc 100644
--- a/doc/development/chatops_on_gitlabcom.md
+++ b/doc/development/chatops_on_gitlabcom.md
@@ -17,7 +17,8 @@ To request access to Chatops on GitLab.com:
     1. You could also use the "Sign in with" Google button to sign in, with your GitLab.com email address.
 1. Ask in the [#production](https://gitlab.slack.com/messages/production) channel for an existing member to add you to the `chatops` project in Ops. They can do it by running `/chatops run member add <username> gitlab-com/chatops --ops` command in that channel.
 
-NOTE: **Note:** If you had to change your username for GitLab.com on the first step, make sure [to reflect this information](https://gitlab.com/gitlab-com/www-gitlab-com#adding-yourself-to-the-team-page) on [the team page](https://about.gitlab.com/company/team/).
+NOTE: **Note:**
+If you had to change your username for GitLab.com on the first step, make sure [to reflect this information](https://gitlab.com/gitlab-com/www-gitlab-com#adding-yourself-to-the-team-page) on [the team page](https://about.gitlab.com/company/team/).
 
 ## See also
 
diff --git a/doc/development/cicd/index.md b/doc/development/cicd/index.md
index 4be671644ff..e0cca00fd69 100644
--- a/doc/development/cicd/index.md
+++ b/doc/development/cicd/index.md
@@ -92,7 +92,8 @@ A job with the `created` state won't be seen by the Runner yet. To make it possi
 
 When the Runner is connected, it requests the next `pending` job to run by polling the server continuously.
 
-NOTE: **Note:** API endpoints used by the Runner to interact with GitLab are defined in [`lib/api/runner.rb`](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/api/runner.rb)
+NOTE: **Note:**
+API endpoints used by the Runner to interact with GitLab are defined in [`lib/api/runner.rb`](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/api/runner.rb)
 
 After the server receives the request it selects a `pending` job based on the [`Ci::RegisterJobService` algorithm](#ciregisterjobservice), then assigns and sends the job to the Runner.
 
@@ -126,7 +127,8 @@ There are 3 top level queries that this service uses to gather the majority of t
 
 This list of jobs is then filtered further by matching tags between job and Runner tags.
 
-NOTE: **Note:** If a job contains tags, the Runner will not pick the job if it does not match **all** the tags.
+NOTE: **Note:**
+If a job contains tags, the Runner will not pick the job if it does not match **all** the tags.
 The Runner may have more tags than defined for the job, but not vice-versa.
 
 Finally if the Runner can only pick jobs that are tagged, all untagged jobs are filtered out.
diff --git a/doc/development/database/add_foreign_key_to_existing_column.md b/doc/development/database/add_foreign_key_to_existing_column.md
index b8817eddeec..1b41a52c95e 100644
--- a/doc/development/database/add_foreign_key_to_existing_column.md
+++ b/doc/development/database/add_foreign_key_to_existing_column.md
@@ -113,7 +113,8 @@ end
 
 Validating the foreign key will scan the whole table and make sure that each relation is correct.
 
-NOTE: **Note:** When using [background migrations](../background_migrations.md), foreign key validation should happen in the next GitLab release.
+NOTE: **Note:**
+When using [background migrations](../background_migrations.md), foreign key validation should happen in the next GitLab release.
 
 Migration file for validating the foreign key:
 
diff --git a/doc/development/database_review.md b/doc/development/database_review.md
index 5405a8808f0..f864f13f489 100644
--- a/doc/development/database_review.md
+++ b/doc/development/database_review.md
@@ -190,7 +190,8 @@ In general, migrations for a single deploy shouldn't take longer than
 1 hour for GitLab.com. The following guidelines are not hard rules, they were
 estimated to keep migration timing to a minimum.
 
-NOTE: **Note:** Keep in mind that all runtimes should be measured against GitLab.com.
+NOTE: **Note:**
+Keep in mind that all runtimes should be measured against GitLab.com.
 
 | Migration Type | Execution Time Recommended | Notes |
 |----|----|---|
diff --git a/doc/development/documentation/site_architecture/global_nav.md b/doc/development/documentation/site_architecture/global_nav.md
index 71020e6054e..ba265e26b52 100644
--- a/doc/development/documentation/site_architecture/global_nav.md
+++ b/doc/development/documentation/site_architecture/global_nav.md
@@ -98,7 +98,7 @@ for clarity.
 To see the improvements planned, check the
 [global nav epic](https://gitlab.com/groups/gitlab-com/-/epics/21).
 
-CAUTION: **Attention!**
+NOTE: **Note:**
 **Do not** [add items](#adding-new-items) to the global nav without
 the consent of one of the technical writers.
 
@@ -275,7 +275,7 @@ and the following syntax rules.
   an "information" icon on the nav to make the user aware that the feature is
   EE-only.
 
-DANGER: **Important!**
+CAUTION: **Caution:**
 All links present on the data file must end in `.html`, not `.md`. Do not
 start any relative link with a forward slash `/`.
 
diff --git a/doc/development/documentation/site_architecture/index.md b/doc/development/documentation/site_architecture/index.md
index 027c383bc6c..60e6d4bcb13 100644
--- a/doc/development/documentation/site_architecture/index.md
+++ b/doc/development/documentation/site_architecture/index.md
@@ -111,7 +111,7 @@ located in the [Dockerfiles directory](https://gitlab.com/gitlab-org/gitlab-docs
 
 If you need to rebuild the Docker images immediately (must have maintainer level permissions):
 
-CAUTION: **Caution**
+CAUTION: **Caution:**
 If you change the dockerfile configuration and rebuild the images, you can break the master
 pipeline in the main `gitlab` repository as well as in `gitlab-docs`. Create an image with
 a different name first and test it to ensure you do not break the pipelines.
diff --git a/doc/development/geo/framework.md b/doc/development/geo/framework.md
index e8e38372664..de4d6fb869d 100644
--- a/doc/development/geo/framework.md
+++ b/doc/development/geo/framework.md
@@ -1,11 +1,13 @@
 # Geo self-service framework (alpha)
 
-NOTE: **Note:** This document might be subjected to change. It's a
+NOTE: **Note:**
+This document might be subjected to change. It's a
 proposal we're working on and once the implementation is complete this
 documentation will be updated. Follow progress in the
 [epic](https://gitlab.com/groups/gitlab-org/-/epics/2161).
 
-NOTE: **Note:** The Geo self-service framework is currently in
+NOTE: **Note:**
+The Geo self-service framework is currently in
 alpha. If you need to replicate a new data type, reach out to the Geo
 team to discuss the options. You can contact them in `#g_geo` on Slack
 or mention `@geo-team` in the issue or merge request.
diff --git a/doc/development/gitaly.md b/doc/development/gitaly.md
index 417c96a44dd..60f0823536e 100644
--- a/doc/development/gitaly.md
+++ b/doc/development/gitaly.md
@@ -114,7 +114,8 @@ bundle exec rake gitlab:features:disable_rugged
 
 Most of this code exists in the `lib/gitlab/git/rugged_impl` directory.
 
-NOTE: **Note:** You should NOT need to add or modify code related to
+NOTE: **Note:**
+You should NOT need to add or modify code related to
 Rugged unless explicitly discussed with the [Gitaly
 Team](https://gitlab.com/groups/gl-gitaly/group_members). This code will
 NOT work on GitLab.com or other GitLab instances that do not use NFS.
diff --git a/doc/development/i18n/externalization.md b/doc/development/i18n/externalization.md
index bdd372e90ed..bce95dfc24e 100644
--- a/doc/development/i18n/externalization.md
+++ b/doc/development/i18n/externalization.md
@@ -95,7 +95,8 @@ Active Record's `:message` option accepts a `Proc`, so we can do this instead:
 validates :group_id, uniqueness: { scope: [:project_id], message: -> (object, data) { _("already shared with this group") } }
 ```
 
-NOTE: **Note:** Messages in the API (`lib/api/` or `app/graphql`) do
+NOTE: **Note:**
+Messages in the API (`lib/api/` or `app/graphql`) do
 not need to be externalised.
 
 ### HAML files
diff --git a/doc/development/import_export.md b/doc/development/import_export.md
index ecdfd8a853e..556fa6c7db4 100644
--- a/doc/development/import_export.md
+++ b/doc/development/import_export.md
@@ -408,4 +408,5 @@ tree
     └── 4352.json
 ```
 
-CAUTION: **Caution:** When updating these fixtures, please ensure you update both `json` files and `tree` folder, as the tests apply to both.
+CAUTION: **Caution:**
+When updating these fixtures, please ensure you update both `json` files and `tree` folder, as the tests apply to both.
diff --git a/doc/development/import_project.md b/doc/development/import_project.md
index 1c5beffea1a..1fa6ea5d405 100644
--- a/doc/development/import_project.md
+++ b/doc/development/import_project.md
@@ -17,7 +17,8 @@ The first option is to simply [import the Project tarball file via the GitLab UI
 
 It should take up to 15 minutes for the project to fully import. You can head to the project's main page for the current status.
 
-NOTE: **Note:** This method ignores all the errors silently (including the ones related to `GITALY_DISABLE_REQUEST_LIMITS`) and is used by GitLab's users. For development and testing, check the other methods below.
+NOTE: **Note:**
+This method ignores all the errors silently (including the ones related to `GITALY_DISABLE_REQUEST_LIMITS`) and is used by GitLab's users. For development and testing, check the other methods below.
 
 ### Importing via the `import-project` script
 
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 833693e896d..22de9bc9c58 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -604,7 +604,8 @@ In this particular case, the default value exists and we're just changing the me
 `request_access_enabled` column, which does not imply a rewrite of all the existing records
 in the `namespaces` table. Only when creating a new column with a default, all the records are going be rewritten.
 
-NOTE: **Note:**  A faster [ALTER TABLE ADD COLUMN with a non-null default](https://www.depesz.com/2018/04/04/waiting-for-postgresql-11-fast-alter-table-add-column-with-a-non-null-default/)
+NOTE: **Note:**
+A faster [ALTER TABLE ADD COLUMN with a non-null default](https://www.depesz.com/2018/04/04/waiting-for-postgresql-11-fast-alter-table-add-column-with-a-non-null-default/)
 was introduced on PostgresSQL 11.0, removing the need of rewriting the table when a new column with a default value is added.
 
 For the reasons mentioned above, it's safe to use `change_column_default` in a single-transaction migration
diff --git a/doc/development/packages.md b/doc/development/packages.md
index edf01255e84..ae67af10d88 100644
--- a/doc/development/packages.md
+++ b/doc/development/packages.md
@@ -68,7 +68,8 @@ The current state of existing package registries availability is:
 | Go              | Yes | No - [open issue](https://gitlab.com/gitlab-org/gitlab/-/issues/213900) | No - [open-issue](https://gitlab.com/gitlab-org/gitlab/-/issues/213902) |
 | Composer | Yes | Yes | No |
 
-NOTE: **Note:** NPM is currently a hybrid of the instance level and group level.
+NOTE: **Note:**
+NPM is currently a hybrid of the instance level and group level.
 It is using the top-level group or namespace as the defining portion of the name
 (for example, `@my-group-name/my-package-name`).
 
diff --git a/doc/development/performance.md b/doc/development/performance.md
index b33fc8b246f..16ea1aa27ff 100644
--- a/doc/development/performance.md
+++ b/doc/development/performance.md
@@ -272,7 +272,8 @@ Currently supported profiling targets are:
 - Puma worker
 - Sidekiq
 
-NOTE: **Note:** The Puma master process is not supported. Neither is Unicorn.
+NOTE: **Note:**
+The Puma master process is not supported. Neither is Unicorn.
 Sending SIGUSR2 to either of those will trigger restarts. In the case of Puma,
 take care to only send the signal to Puma workers.
 
diff --git a/doc/development/profiling.md b/doc/development/profiling.md
index 2cab6750b9b..f7ead94d725 100644
--- a/doc/development/profiling.md
+++ b/doc/development/profiling.md
@@ -10,7 +10,8 @@ There is a `Gitlab::Profiler.profile` method, and corresponding
 `bin/profile-url` script, that enable profiling a GET or POST request to a
 specific URL, either as an anonymous user (the default) or as a specific user.
 
-NOTE: **Note:** The first argument to the profiler is either a full URL
+NOTE: **Note:**
+The first argument to the profiler is either a full URL
 (including the instance hostname) or an absolute path, including the
 leading slash.
 
diff --git a/doc/development/sidekiq_style_guide.md b/doc/development/sidekiq_style_guide.md
index 04c310288d2..2793756ff64 100644
--- a/doc/development/sidekiq_style_guide.md
+++ b/doc/development/sidekiq_style_guide.md
@@ -303,7 +303,8 @@ class ExternalDependencyWorker
 end
 ```
 
-NOTE: **Note:** Note that a job cannot be both high urgency and have
+NOTE: **Note:**
+Note that a job cannot be both high urgency and have
 external dependencies.
 
 ## CPU-bound and Memory-bound Workers
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index 2b0dd473129..4e46e691405 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -110,7 +110,8 @@ Use the coverage reports to ensure your tests cover 100% of your code.
 
 ### System / Feature tests
 
-NOTE: **Note:** Before writing a new system test, [please consider **not**
+NOTE: **Note:**
+Before writing a new system test, [please consider **not**
 writing one](testing_levels.md#consider-not-writing-a-system-test)!
 
 - Feature specs should be named `ROLE_ACTION_spec.rb`, such as
diff --git a/doc/development/testing_guide/end_to_end/environment_selection.md b/doc/development/testing_guide/end_to_end/environment_selection.md
index 698d061ced2..9eb7db72a51 100644
--- a/doc/development/testing_guide/end_to_end/environment_selection.md
+++ b/doc/development/testing_guide/end_to_end/environment_selection.md
@@ -33,7 +33,7 @@ RSpec.describe 'Area' do
   it 'runs in any environment' do; end
 
   it 'runs only in production', only: :production do; end
-  
+
   it 'runs only in staging', only: { subdomain: :staging } do; end
 
   it 'runs in dev', only: { tld: '.org', domain: 'gitlab', subdomain: 'dev' } do; end
@@ -45,3 +45,10 @@ end
 NOTE: **Note:**
 If the test has a `before` or `after`, you must add the `only` metadata
 to the outer `RSpec.describe`.
+
+## Quarantining a test for a specific environment
+
+Similarly to specifying that a test should only run against a specific environment, it's also possible to quarantine a
+test only when it runs against a specific environment. The syntax is exactly the same, except that the `only: { ... }`
+hash is nested in the [`quarantine: { ... }`](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests) hash.
+For instance, `quarantine: { only: { subdomain: :staging } }` will only quarantine the test when run against staging.
diff --git a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
index 61d14b586ea..4059c1960e2 100644
--- a/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
+++ b/doc/development/testing_guide/end_to_end/rspec_metadata_tests.md
@@ -10,7 +10,7 @@ This is a partial list of the [RSpec metadata](https://relishapp.com/rspec/rspec
 | `:elasticsearch`  | The test requires an Elasticsearch service. It is used by the [instance-level scenario](https://gitlab.com/gitlab-org/gitlab-qa#definitions) [`Test::Integration::Elasticsearch`](https://gitlab.com/gitlab-org/gitlab/-/blob/72b62b51bdf513e2936301cb6c7c91ec27c35b4d/qa/qa/ee/scenario/test/integration/elasticsearch.rb) to include only tests that require Elasticsearch. |
 | `:kubernetes`     | The test includes a GitLab instance that is configured to be run behind an SSH tunnel, allowing a TLS-accessible GitLab. This test will also include provisioning of at least one Kubernetes cluster to test against. *This tag is often be paired with `:orchestrated`.* |
 | `:orchestrated`   | The GitLab instance under test may be [configured by `gitlab-qa`](https://gitlab.com/gitlab-org/gitlab-qa/-/blob/master/docs/what_tests_can_be_run.md#orchestrated-tests) to be different to the default GitLab configuration, or `gitlab-qa` may launch additional services in separate Docker containers, or both. Tests tagged with `:orchestrated` are excluded when testing environments where we can't dynamically modify GitLab's configuration (for example, Staging). |
-| `:quarantine`     | The test has been [quarantined](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests), will run in a separate job that only includes quarantined tests, and is allowed to fail. The test will be skipped in its regular job so that if it fails it will not hold up the pipeline. |
+| `:quarantine`     | The test has been [quarantined](https://about.gitlab.com/handbook/engineering/quality/guidelines/debugging-qa-test-failures/#quarantining-tests), will run in a separate job that only includes quarantined tests, and is allowed to fail. The test will be skipped in its regular job so that if it fails it will not hold up the pipeline. Note that you can also [quarantine a test only when it runs against specific environment](environment_selection.md#quarantining-a-test-for-a-specific-environment). |
 | `:reliable`       | The test has been [promoted to a reliable test](https://about.gitlab.com/handbook/engineering/quality/guidelines/reliable-tests/#promoting-an-existing-test-to-reliable) meaning it passes consistently in all pipelines, including merge requests. |
 | `:requires_admin` | The test requires an admin account. Tests with the tag are excluded when run against Canary and Production environments. |
 | `:runner`         | The test depends on and will set up a GitLab Runner instance, typically to run a pipeline. |
diff --git a/doc/development/what_requires_downtime.md b/doc/development/what_requires_downtime.md
index d9907abbb92..d0b8aa18f5c 100644
--- a/doc/development/what_requires_downtime.md
+++ b/doc/development/what_requires_downtime.md
@@ -130,7 +130,8 @@ class CleanupUsersUpdatedAtRename < ActiveRecord::Migration[4.2]
 end
 ```
 
-NOTE: **Note:** If you're renaming a [large table](https://gitlab.com/gitlab-org/gitlab/-/blob/master/rubocop/rubocop-migrations.yml#L3), please carefully consider the state when the first migration has run but the second cleanup migration hasn't been run yet.
+NOTE: **Note:**
+If you're renaming a [large table](https://gitlab.com/gitlab-org/gitlab/-/blob/master/rubocop/rubocop-migrations.yml#L3), please carefully consider the state when the first migration has run but the second cleanup migration hasn't been run yet.
 With [Canary](https://about.gitlab.com/handbook/engineering/infrastructure/library/canary/) it is possible that the system runs in this state for a significant amount of time.
 
 ## Changing Column Constraints
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 448c5e149cc..f862630deb5 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -30,7 +30,8 @@ In addition to having a basic familiarity with [AWS](https://docs.aws.amazon.com
 - A domain name for the GitLab instance
 - An SSL/TLS certificate to secure your domain. If you do not already own one, you can provision a free public SSL/TLS certificate through [AWS Certificate Manager](https://aws.amazon.com/certificate-manager/)(ACM) for use with the [Elastic Load Balancer](#load-balancer) we'll create.
 
-NOTE: **Note:** It can take a few hours to validate a certificate provisioned through ACM. To avoid delays later, request your certificate as soon as possible.
+NOTE: **Note:**
+It can take a few hours to validate a certificate provisioned through ACM. To avoid delays later, request your certificate as soon as possible.
 
 ## Architecture
 
@@ -304,7 +305,8 @@ We need a security group for our database that will allow inbound traffic from t
 
 ### Create the database
 
-DANGER: **Danger:** Avoid using burstable instances (t class instances) for the database as this could lead to performance issues due to CPU credits running out during sustained periods of high load.
+DANGER: **Danger:**
+Avoid using burstable instances (t class instances) for the database as this could lead to performance issues due to CPU credits running out during sustained periods of high load.
 
 Now, it's time to create the database:
 
@@ -386,7 +388,8 @@ persistence and is used to store session data, temporary cache information, and
 
 Since our GitLab instances will be in private subnets, we need a way to connect to these instances via SSH to make configuration changes, perform upgrades, etc. One way of doing this is via a [bastion host](https://en.wikipedia.org/wiki/Bastion_host), sometimes also referred to as a jump box.
 
-TIP: **Tip:** If you do not want to maintain bastion hosts, you can set up [AWS Systems Manager Session Manager](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager.html) for access to instances. This is beyond the scope of this document.
+TIP: **Tip:**
+If you do not want to maintain bastion hosts, you can set up [AWS Systems Manager Session Manager](https://docs.aws.amazon.com/systems-manager/latest/userguide/session-manager.html) for access to instances. This is beyond the scope of this document.
 
 ### Create Bastion Host A
 
@@ -542,7 +545,8 @@ gitlab=# \q
 
 #### Set up Gitaly
 
-CAUTION: **Caution:** In this architecture, having a single Gitaly server creates a single point of failure. This limitation will be removed once [Gitaly Cluster](https://gitlab.com/groups/gitlab-org/-/epics/1489) is released.
+CAUTION: **Caution:**
+In this architecture, having a single Gitaly server creates a single point of failure. This limitation will be removed once [Gitaly Cluster](https://gitlab.com/groups/gitlab-org/-/epics/1489) is released.
 
 Gitaly is a service that provides high-level RPC access to Git repositories.
 It should be enabled and configured on a separate EC2 instance in one of the
@@ -568,7 +572,8 @@ Let's create an EC2 instance where we'll install Gitaly:
 1. Click **Review and launch** followed by **Launch** if you're happy with your settings.
 1. Finally, acknowledge that you have access to the selected private key file or create a new one. Click **Launch Instances**.
 
-NOTE: **Optional:** Instead of storing configuration _and_ repository data on the root volume, you can also choose to add an additional EBS volume for repository storage. Follow the same guidance as above. See the [Amazon EBS pricing](https://aws.amazon.com/ebs/pricing/). We do not recommend using EFS as it may negatively impact GitLab’s performance. You can review the [relevant documentation](../../administration/high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
+NOTE: **Note:**
+Instead of storing configuration _and_ repository data on the root volume, you can also choose to add an additional EBS volume for repository storage. Follow the same guidance as above. See the [Amazon EBS pricing](https://aws.amazon.com/ebs/pricing/). We do not recommend using EFS as it may negatively impact GitLab’s performance. You can review the [relevant documentation](../../administration/high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
 
 Now that we have our EC2 instance ready, follow the [documentation to install GitLab and set up Gitaly on its own server](../../administration/gitaly/index.md#run-gitaly-on-its-own-server). Perform the client setup steps from that document on the [GitLab instance we created](#install-gitlab) above.
 
diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md
index 7ae23d6831e..519a0a5b7aa 100644
--- a/doc/install/openshift_and_gitlab/index.md
+++ b/doc/install/openshift_and_gitlab/index.md
@@ -25,7 +25,8 @@ For a video demonstration on installing GitLab on OpenShift, check the article [
 
 ## Prerequisites
 
-CAUTION: **Caution:** This information is no longer up to date, as the current versions
+CAUTION: **Caution:**
+This information is no longer up to date, as the current versions
 have changed and products have been renamed.
 
 OpenShift 3 is not yet deployed on RedHat's offered [Online platform](https://www.openshift.com/),
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index 69680755b68..5bc587627f5 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -90,7 +90,8 @@ Apart from a local hard drive you can also mount a volume that supports the netw
 
 If you have enough RAM and a recent CPU the speed of GitLab is mainly limited by hard drive seek times. Having a fast drive (7200 RPM and up) or a solid state drive (SSD) will improve the responsiveness of GitLab.
 
-NOTE: **Note:** Since file system performance may affect GitLab's overall performance, [we don't recommend using AWS EFS for storage](../administration/high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs).
+NOTE: **Note:**
+Since file system performance may affect GitLab's overall performance, [we don't recommend using AWS EFS for storage](../administration/high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs).
 
 ### CPU
 
@@ -145,7 +146,8 @@ GitLab database. This extension [can be enabled](https://www.postgresql.org/docs
 On some systems you may need to install an additional package (for example,
 `postgresql-contrib`) for this extension to become available.
 
-NOTE: **Note:** Support for [PostgreSQL 9.6 and 10 has been removed in GitLab 13.0](https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/#postgresql-11-is-now-the-minimum-required-version-to-install-gitlab) so that GitLab can benefit from PostgreSQL 11 improvements, such as partitioning. For the schedule of transitioning to PostgreSQL 12, see [the related epic](https://gitlab.com/groups/gitlab-org/-/epics/2184).
+NOTE: **Note:**
+Support for [PostgreSQL 9.6 and 10 has been removed in GitLab 13.0](https://about.gitlab.com/releases/2020/05/22/gitlab-13-0-released/#postgresql-11-is-now-the-minimum-required-version-to-install-gitlab) so that GitLab can benefit from PostgreSQL 11 improvements, such as partitioning. For the schedule of transitioning to PostgreSQL 12, see [the related epic](https://gitlab.com/groups/gitlab-org/-/epics/2184).
 
 #### Additional requirements for GitLab Geo
 
@@ -260,7 +262,8 @@ For reference, GitLab.com's [auto-scaling shared runner](../user/gitlab_com/inde
 
 ## Supported web browsers
 
-CAUTION: **Caution:** With GitLab 13.0 (May 2020) we have removed official support for Internet Explorer 11.
+CAUTION: **Caution:**
+With GitLab 13.0 (May 2020) we have removed official support for Internet Explorer 11.
 With the release of GitLab 13.4 (September 2020) we will remove all code that supports Internet Explorer 11.
 You can provide feedback [on this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/197987) or via your usual support channels.
 
@@ -277,7 +280,8 @@ For the listed web browsers, GitLab supports:
 - The current and previous major versions of browsers except Internet Explorer.
 - The current minor version of a supported major version.
 
-NOTE: **Note:** We don't support running GitLab with JavaScript disabled in the browser and have no plans of supporting that
+NOTE: **Note:**
+We don't support running GitLab with JavaScript disabled in the browser and have no plans of supporting that
 in the future because we have features such as Issue Boards which require JavaScript extensively.
 
 <!-- ## Troubleshooting
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index aa534078105..0f2709b3d6e 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -173,7 +173,7 @@ You can filter the selection dropdown by writing part of the namespace or projec
 NOTE: **Note:**
 If no namespaces or projects are selected, no Elasticsearch indexing will take place.
 
-CAUTION: **Warning**:
+CAUTION: **Warning:**
 If you have already indexed your instance, you will have to regenerate the index in order to delete all existing data
 for filtering to work correctly. To do this run the Rake tasks `gitlab:elastic:recreate_index` and
 `gitlab:elastic:clear_index_status`. Afterwards, removing a namespace or a project from the list will delete the data
@@ -240,7 +240,7 @@ Indexing can be performed using Rake tasks.
 
 #### Indexing small instances
 
-CAUTION: **Warning**:
+CAUTION: **Warning:**
 This will delete your existing indexes.
 
 If the database size is less than 500 MiB, and the size of all hosted repos is less than 5 GiB:
@@ -260,7 +260,7 @@ If the database size is less than 500 MiB, and the size of all hosted repos is l
 
 #### Indexing large instances
 
-CAUTION: **Warning**:
+CAUTION: **Warning:**
 Performing asynchronous indexing will generate a lot of Sidekiq jobs.
 Make sure to prepare for this task by having a [Scalable and Highly Available Setup](README.md)
 or creating [extra Sidekiq processes](../administration/operations/extra_sidekiq_processes.md)
@@ -632,7 +632,8 @@ Here are some common pitfalls and how to overcome them:
   **For a single node Elasticsearch cluster the functional cluster health status will be yellow** (will never be green) because the primary shard is allocated but replicas can not be as there is no other node to which Elasticsearch can assign a replica. This also applies if you are using the
 [Amazon Elasticsearch](https://docs.aws.amazon.com/elasticsearch-service/latest/developerguide/aes-handling-errors.html#aes-handling-errors-yellow-cluster-status) service.
 
-  CAUTION: **Warning**: Setting the number of replicas to `0` is not something that we recommend (this is not allowed in the GitLab Elasticsearch Integration menu). If you are planning to add more Elasticsearch nodes (for a total of more than 1 Elasticsearch) the number of replicas will need to be set to an integer value larger than `0`. Failure to do so will result in lack of redundancy (losing one node will corrupt the index).
+  CAUTION: **Warning:**
+  Setting the number of replicas to `0` is not something that we recommend (this is not allowed in the GitLab Elasticsearch Integration menu). If you are planning to add more Elasticsearch nodes (for a total of more than 1 Elasticsearch) the number of replicas will need to be set to an integer value larger than `0`. Failure to do so will result in lack of redundancy (losing one node will corrupt the index).
 
   If you have a **hard requirement to have a green status for your single node Elasticsearch cluster**, please make sure you understand the risks outlined in the previous paragraph and then simply run the following query to set the number of replicas to `0`(the cluster will no longer try to create any shard replicas):
 
diff --git a/doc/policy/maintenance.md b/doc/policy/maintenance.md
index 093c2d94217..5b3fc3e0021 100644
--- a/doc/policy/maintenance.md
+++ b/doc/policy/maintenance.md
@@ -70,7 +70,8 @@ one major version. For example, it is safe to:
   - `9.5.5` -> `9.5.9`
   - `8.9.2` -> `8.9.6`
 
-NOTE: **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).
+NOTE: **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).
 
 NOTE: **Note:**
 Instructions are available for downloading an Omnibus GitLab Linux package locally and [manually installing](https://docs.gitlab.com/omnibus/manual_install.html) it.
diff --git a/doc/raketasks/backup_restore.md b/doc/raketasks/backup_restore.md
index 0df41894fec..ccef9f40511 100644
--- a/doc/raketasks/backup_restore.md
+++ b/doc/raketasks/backup_restore.md
@@ -515,7 +515,8 @@ backups will be copied to, and will be created if it does not exist. If the
 directory that you want to copy the tarballs to is the root of your mounted
 directory, just use `.` instead.
 
-NOTE: **Note:** Since file system performance may affect GitLab's overall performance, we do not recommend using EFS for storage. See the [relevant documentation](../administration/high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
+NOTE: **Note:**
+Since file system performance may affect GitLab's overall performance, we do not recommend using EFS for storage. See the [relevant documentation](../administration/high_availability/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
 
 For Omnibus GitLab packages:
 
diff --git a/doc/security/rack_attack.md b/doc/security/rack_attack.md
index 605b669d498..d3de2222c39 100644
--- a/doc/security/rack_attack.md
+++ b/doc/security/rack_attack.md
@@ -18,11 +18,13 @@ tracking.
 
 For more information on how to use these options see the [Rack Attack README](https://github.com/kickstarter/rack-attack/blob/master/README.md).
 
-NOTE: **Note:** See
+NOTE: **Note:**
+See
 [User and IP rate limits](../user/admin_area/settings/user_and_ip_rate_limits.md)
 for simpler limits that are configured in the UI.
 
-NOTE: **Note:** Starting with GitLab 11.2, Rack Attack is disabled by default. If your
+NOTE: **Note:**
+Starting with GitLab 11.2, Rack Attack is disabled by default. If your
 instance is not exposed to the public internet, it is recommended that you leave
 Rack Attack disabled.
 
diff --git a/doc/topics/autodevops/customize.md b/doc/topics/autodevops/customize.md
index 046db7a944b..4b862f9e14c 100644
--- a/doc/topics/autodevops/customize.md
+++ b/doc/topics/autodevops/customize.md
@@ -218,7 +218,7 @@ include:
 
 See the [Auto DevOps template](https://gitlab.com/gitlab-org/gitlab/blob/master/lib/gitlab/ci/templates/Auto-DevOps.gitlab-ci.yml) for information on available jobs.
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 Auto DevOps templates using the [`only`](../../ci/yaml/README.md#onlyexcept-basic) or
 [`except`](../../ci/yaml/README.md#onlyexcept-basic) syntax will switch
 to the [`rules`](../../ci/yaml/README.md#rules) syntax, starting in
@@ -243,7 +243,7 @@ postgres://user:password@postgres-host:postgres-port/postgres-database
 
 ### Upgrading PostgresSQL
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 The variable `AUTO_DEVOPS_POSTGRES_CHANNEL` that controls default provisioned
 PostgreSQL was changed to `2` in [GitLab 13.0](https://gitlab.com/gitlab-org/gitlab/-/issues/210499).
 To keep using the old PostgreSQL, set the `AUTO_DEVOPS_POSTGRES_CHANNEL` variable to
diff --git a/doc/topics/autodevops/stages.md b/doc/topics/autodevops/stages.md
index 6d782373f39..ae2be21ddc9 100644
--- a/doc/topics/autodevops/stages.md
+++ b/doc/topics/autodevops/stages.md
@@ -72,7 +72,8 @@ Heroku buildpacks, with the following caveats:
 - The `/bin/herokuish` command is not present in the resulting image, and prefixing
   commands with `/bin/herokuish procfile exec` is no longer required (nor possible).
 
-NOTE: **Note:** Auto Test still uses Herokuish, as test suite detection is not
+NOTE: **Note:**
+Auto Test still uses Herokuish, as test suite detection is not
 yet part of the Cloud Native Buildpack specification. For more information, see
 [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/212689).
 
@@ -372,7 +373,7 @@ as it attempts to fetch the image using `CI_REGISTRY_PASSWORD`.
 > - Support for deploying a PostgreSQL version that supports Kubernetes 1.16+ was [introduced](https://gitlab.com/gitlab-org/cluster-integration/auto-deploy-image/-/merge_requests/49) in GitLab 12.9.
 > - Supported out of the box for new deployments as of GitLab 13.0.
 
-CAUTION: **Deprecation**
+CAUTION: **Deprecation:**
 The default value for the `deploymentApiVersion` setting was changed from
 `extensions/v1beta` to `apps/v1` in [GitLab 13.0](https://gitlab.com/gitlab-org/charts/auto-deploy-app/-/issues/47).
 
@@ -398,7 +399,8 @@ To use Auto Deploy on a Kubernetes 1.16+ cluster:
 1. If you are deploying your application for the first time and are using
    GitLab 12.9 or 12.10, set `AUTO_DEVOPS_POSTGRES_CHANNEL` to `2`.
 
-DANGER: **Danger:** On GitLab 12.9 and 12.10, opting into
+DANGER: **Danger:**
+On GitLab 12.9 and 12.10, opting into
 `AUTO_DEVOPS_POSTGRES_CHANNEL` version `2` deletes the version `1` PostgreSQL
 database. Follow the [guide to upgrading PostgreSQL](upgrading_postgresql.md)
 to back up and restore your database before opting into version `2` (On
diff --git a/doc/topics/autodevops/upgrading_postgresql.md b/doc/topics/autodevops/upgrading_postgresql.md
index 846e537e5b3..2ebe362280f 100644
--- a/doc/topics/autodevops/upgrading_postgresql.md
+++ b/doc/topics/autodevops/upgrading_postgresql.md
@@ -30,7 +30,8 @@ involves:
    any existing channel 1 database. For more information, see
    [Detected an existing PostgreSQL database](index.md#detected-an-existing-postgresql-database).
 
-TIP: **Tip:** If you have configured Auto DevOps to have staging,
+TIP: **Tip:**
+If you have configured Auto DevOps to have staging,
 consider trying out the backup and restore steps on staging first, or
 trying this out on a review app.
 
@@ -161,11 +162,13 @@ pvc-9085e3d3-5239-11ea-9c8d-42010a8e0096   8Gi        RWO            Retain
 
 ## Install new PostgreSQL
 
-CAUTION: **Caution:** Using the newer version of PostgreSQL will delete
+CAUTION: **Caution:**
+Using the newer version of PostgreSQL will delete
 the older 0.7.1 PostgreSQL. To prevent the underlying data from being
 deleted, you can choose to retain the [persistent volume](#retain-persistent-volumes).
 
-TIP: **Tip:** You can also
+TIP: **Tip:**
+You can also
 [scope](../../ci/environments/index.md#scoping-environments-with-specs) the
 `AUTO_DEVOPS_POSTGRES_CHANNEL`, `AUTO_DEVOPS_POSTGRES_DELETE_V1` and
 `POSTGRES_VERSION` variables to specific environments, e.g. `staging`.
diff --git a/doc/update/README.md b/doc/update/README.md
index 27501d0ab97..26e52229fd2 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -149,9 +149,11 @@ Sidekiq::ScheduledSet.new.select { |r| r.klass == 'BackgroundMigrationWorker' }.
 
 ### What do I do if my background migrations are stuck?
 
-CAUTION: **Warning:** The following operations can disrupt your GitLab performance.
+CAUTION: **Warning:**
+The following operations can disrupt your GitLab performance.
 
-NOTE: **Note:** It is safe to re-execute these commands, especially if you have 1000+ pending jobs which would likely overflow your runtime memory.
+NOTE: **Note:**
+It is safe to re-execute these commands, especially if you have 1000+ pending jobs which would likely overflow your runtime memory.
 
 **For Omnibus installations**
 
diff --git a/doc/update/upgrading_from_ce_to_ee.md b/doc/update/upgrading_from_ce_to_ee.md
index 7be1feb99a5..f82f5001c89 100644
--- a/doc/update/upgrading_from_ce_to_ee.md
+++ b/doc/update/upgrading_from_ce_to_ee.md
@@ -4,7 +4,8 @@ comments: false
 
 # Upgrading from Community Edition to Enterprise Edition from source
 
-NOTE: **Note:** In the past we used separate documents for upgrading from
+NOTE: **Note:**
+In the past we used separate documents for upgrading from
 Community Edition to Enterprise Edition. These documents can be found in the
 [`doc/update` directory of Enterprise Edition's source
 code](https://gitlab.com/gitlab-org/gitlab/tree/11-8-stable-ee/doc/update).
diff --git a/doc/user/application_security/configuration/index.md b/doc/user/application_security/configuration/index.md
index a9b879656ed..0f58b18734a 100644
--- a/doc/user/application_security/configuration/index.md
+++ b/doc/user/application_security/configuration/index.md
@@ -20,7 +20,8 @@ The page uses the project's latest default branch [CI pipeline](../../../ci/pipe
 state of each feature. If a job with the expected security report artifact exists in the pipeline,
 the feature is considered configured.
 
-NOTE: **Note:** if the latest pipeline used [Auto DevOps](../../../topics/autodevops/index.md),
+NOTE: **Note:**
+if the latest pipeline used [Auto DevOps](../../../topics/autodevops/index.md),
 all security features will be configured by default.
 
 ## Limitations
diff --git a/doc/user/application_security/dast/index.md b/doc/user/application_security/dast/index.md
index 3cab5ff2cfa..307ab037b0f 100644
--- a/doc/user/application_security/dast/index.md
+++ b/doc/user/application_security/dast/index.md
@@ -466,7 +466,7 @@ DAST can be [configured](#customizing-the-dast-settings) using environment varia
 | `DAST_INCLUDE_ALPHA_VULNERABILITIES` | boolean | Set to `true` to include alpha passive and active scan rules. Default: `false` |
 | `DAST_USE_AJAX_SPIDER` | boolean | Set to `true` to use the AJAX spider in addition to the traditional spider, useful for crawling sites that require JavaScript. Default: `false` |
 | `DAST_ZAP_CLI_OPTIONS` | string | ZAP server command-line options. For example, `-Xmx3072m` would set the Java maximum memory allocation pool size. |
-| `DAST_ZAP_LOG_CONFIGURATION` | string | Set to a semicolon-separated list of additional log4j properties for the ZAP Server. For example, `log4j.logger.org.parosproxy.paros.network.HttpSender=DEBUG` |
+| `DAST_ZAP_LOG_CONFIGURATION` | string | Set to a semicolon-separated list of additional log4j properties for the ZAP Server. For example, `log4j.logger.org.parosproxy.paros.network.HttpSender=DEBUG;log4j.logger.com.crawljax=DEBUG` |
 
 ### DAST command-line options
 
@@ -533,13 +533,14 @@ Debug mode of the ZAP server can be enabled using the `DAST_ZAP_LOG_CONFIGURATIO
 The following table outlines examples of values that can be set and the effect that they have on the output that is logged.
 Multiple values can be specified, separated by semicolons.
 
-| Log configuration value                            | Effect                                                            |
-|--------------------------------------------------  | ----------------------------------------------------------------- |
-| `log4j.rootLogger=DEBUG`                           | Enable all debug logging statements.                              |
-| `log4j.logger.org.apache.commons.httpclient=DEBUG` | Log every HTTP request and response made by the ZAP server.       |
-| `log4j.logger.com.crawljax=DEBUG`                  | Enable Ajax Crawler debug logging statements.                     |
-| `log4j.logger.org.parosproxy.paros=DEBUG`          | Enable ZAP server proxy debug logging statements.                 |
-| `log4j.logger.org.zaproxy.zap=DEBUG`               | Enable debug logging statements of the general ZAP server code.   |
+| Log configuration value                                      | Effect                                                            |
+|--------------------------------------------------            | ----------------------------------------------------------------- |
+| `log4j.rootLogger=DEBUG`                                     | Enable all debug logging statements.                              |
+| `log4j.logger.org.apache.commons.httpclient=DEBUG`           | Log every HTTP request and response made by the ZAP server.       |
+| `log4j.logger.org.zaproxy.zap.spider.SpiderController=DEBUG` | Log URLs found during the spider scan of the target.              |
+| `log4j.logger.com.crawljax=DEBUG`                            | Enable Ajax Crawler debug logging statements.                     |
+| `log4j.logger.org.parosproxy.paros=DEBUG`                    | Enable ZAP server proxy debug logging statements.                 |
+| `log4j.logger.org.zaproxy.zap=DEBUG`                         | Enable debug logging statements of the general ZAP server code.   |
 
 ## Running DAST in an offline environment
 
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 1bbae96a943..8d09961a35d 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -58,7 +58,8 @@ If you're using the shared Runners on GitLab.com, this is enabled by default.
 
 Beginning with GitLab 13.0, Docker privileged mode is necessary only if you've [enabled Docker-in-Docker for SAST](#enabling-docker-in-docker).
 
-CAUTION: **Caution:** Our SAST jobs currently expect a Linux container type. Windows containers are not yet supported.
+CAUTION: **Caution:**
+Our SAST jobs currently expect a Linux container type. Windows containers are not yet supported.
 
 CAUTION: **Caution:**
 If you use your own Runners, make sure the Docker version installed
diff --git a/doc/user/application_security/secret_detection/index.md b/doc/user/application_security/secret_detection/index.md
index b0bac0095a6..2c07c3c384d 100644
--- a/doc/user/application_security/secret_detection/index.md
+++ b/doc/user/application_security/secret_detection/index.md
@@ -39,7 +39,8 @@ To run Secret Detection jobs, by default, you need GitLab Runner with the
 [`kubernetes`](https://docs.gitlab.com/runner/install/kubernetes.html) executor.
 If you're using the shared Runners on GitLab.com, this is enabled by default.
 
-CAUTION: **Caution:** Our Secret Detection jobs currently expect a Linux container type. Windows containers are not yet supported.
+CAUTION: **Caution:**
+Our Secret Detection jobs currently expect a Linux container type. Windows containers are not yet supported.
 
 CAUTION: **Caution:**
 If you use your own Runners, make sure the Docker version installed
diff --git a/doc/user/group/index.md b/doc/user/group/index.md
index 465b2204250..5ba0680127c 100644
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -462,7 +462,7 @@ It is currently not possible to rename a namespace if it contains a
 project with [Container Registry](../packages/container_registry/index.md) tags,
 because the project cannot be moved.
 
-TIP: **TIP:**
+TIP: **Tip:**
 If you want to retain ownership over the original namespace and
 protect the URL redirects, then instead of changing a group's path or renaming a
 username, you can create a new group and transfer projects to it.
diff --git a/doc/user/group/saml_sso/index.md b/doc/user/group/saml_sso/index.md
index 6aa2ea67407..afd676cf897 100644
--- a/doc/user/group/saml_sso/index.md
+++ b/doc/user/group/saml_sso/index.md
@@ -88,7 +88,8 @@ To disallow users to contribute outside of the top-level group, please see [Grou
 
 ## Providers
 
-NOTE: **Note:** GitLab is unable to provide support for IdPs that are not listed here.
+NOTE: **Note:**
+GitLab is unable to provide support for IdPs that are not listed here.
 
 | Provider | Documentation |
 |----------|---------------|
diff --git a/doc/user/group/saml_sso/scim_setup.md b/doc/user/group/saml_sso/scim_setup.md
index a0297f55a37..13e9d623e2c 100644
--- a/doc/user/group/saml_sso/scim_setup.md
+++ b/doc/user/group/saml_sso/scim_setup.md
@@ -92,7 +92,8 @@ You can then test the connection by clicking on **Test Connection**. If the conn
 
 1. Save your changes. For reference, you can view [an example configuration in the troubleshooting reference](../../../administration/troubleshooting/group_saml_scim.md#azure-active-directory).
 
-   NOTE: **Note:** If you used a unique identifier **other than** `objectId`, be sure to map it to `externalId`.
+   NOTE: **Note:**
+   If you used a unique identifier **other than** `objectId`, be sure to map it to `externalId`.
 
 1. Below the mapping list click on **Show advanced options > Edit attribute list for AppName**.
 
@@ -127,7 +128,8 @@ Before proceeding, be sure to complete the [GitLab configuration](#gitlab-config
 1. If you see an **Admin** button in the top right, click the button. This will
    ensure you are in the Admin area.
 
-   TIP: **Tip:** If you're using the Developer Console, click **Developer Console** in the top
+   TIP: **Tip:**
+   If you're using the Developer Console, click **Developer Console** in the top
    bar and select **Classic UI**. Otherwise, you may not see the buttons described
    in the following steps:
 
diff --git a/doc/user/markdown.md b/doc/user/markdown.md
index 252f00dfaa4..b2b3f0f925c 100644
--- a/doc/user/markdown.md
+++ b/doc/user/markdown.md
@@ -14,7 +14,8 @@ website uses an extended Kramdown gem, [GitLab Kramdown](https://gitlab.com/gitl
 Consult the [GitLab Kramdown Guide](https://about.gitlab.com/handbook/markdown-guide/)
 for a complete Kramdown reference.
 
-NOTE: **Note:** We encourage you to view this document as [rendered by GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md).
+NOTE: **Note:**
+We encourage you to view this document as [rendered by GitLab itself](https://gitlab.com/gitlab-org/gitlab/blob/master/doc/user/markdown.md).
 
 ## GitLab Flavored Markdown (GFM)
 
@@ -76,7 +77,8 @@ character of the top list item (`C` in this case):
    - dark
    - milk
 
-NOTE: **Note:** We will flag any significant differences between Redcarpet and CommonMark
+NOTE: **Note:**
+We will flag any significant differences between Redcarpet and CommonMark
   Markdown in this document.
 
 If you have a large volume of Markdown files, it can be tedious to determine
@@ -261,7 +263,8 @@ when rendered within GitLab, may appear different depending on the OS and browse
 
 Most emoji are natively supported on macOS, Windows, iOS, Android, and will fall back on image-based emoji where there is no support.
 
-NOTE: **Note:** On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/help/emoji/)
+NOTE: **Note:**
+On Linux, you can download [Noto Color Emoji](https://www.google.com/get/noto/help/emoji/)
 to get full native emoji support. Ubuntu 18.04 (like many modern Linux distributions) has
 this font installed by default.
 
@@ -402,7 +405,8 @@ a^2+b^2=c^2
 
 _Be advised that KaTeX only supports a [subset](https://katex.org/docs/supported.html) of LaTeX._
 
-NOTE: **Note:** This also works for the Asciidoctor `:stem: latexmath`. For details see
+NOTE: **Note:**
+This also works for the Asciidoctor `:stem: latexmath`. For details see
 the [Asciidoctor user manual](https://asciidoctor.org/docs/user-manual/#activating-stem-support).
 
 ### Special GitLab references
@@ -779,7 +783,8 @@ Combined emphasis with **asterisks and _underscores_**.
 
 Strikethrough uses two tildes. ~~Scratch this.~~
 
-NOTE: **Note:** Strikethrough is not part of the core Markdown standard, but is part of GFM.
+NOTE: **Note:**
+Strikethrough is not part of the core Markdown standard, but is part of GFM.
 
 #### Multiple underscores in words and mid-word emphasis
 
@@ -1246,7 +1251,8 @@ Do not change to reference style links.
 
 Some text to show that the reference links can follow later.
 
-NOTE: **Note:** Relative links do not allow the referencing of project files in a wiki
+NOTE: **Note:**
+Relative links do not allow the referencing of project files in a wiki
 page, or a wiki page in a project file. The reason for this is that a wiki is always
 in a separate Git repository in GitLab. For example, `[I'm a reference-style link](style)`
 will point the link to `wikis/style` only when the link is inside of a wiki Markdown file.
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index c621e4ce502..390b2c28e10 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -238,7 +238,8 @@ The regex that is used for naming is validating all package names from all packa
 It allows for capital letters, while NPM does not, and allows for almost all of the
 characters NPM allows with a few exceptions (`~` is not allowed).
 
-NOTE: **Note:** Capital letters are needed because the scope is required to be
+NOTE: **Note:**
+Capital letters are needed because the scope is required to be
 identical to the top level namespace of the project. So, for example, if your
 project path is `My-Group/project-foo`, your package must be named `@My-Group/any-package-name`.
 `@my-group/any-package-name` will not work.
diff --git a/doc/user/profile/account/delete_account.md b/doc/user/profile/account/delete_account.md
index 3c6f2989091..a70d11438f4 100644
--- a/doc/user/profile/account/delete_account.md
+++ b/doc/user/profile/account/delete_account.md
@@ -35,7 +35,8 @@ As an administrator, you can delete a user account by:
    - **Delete user and contributions** to delete the user and
      their associated records.
 
-DANGER: **Danger:** Using the **Delete user and contributions** option may result
+DANGER: **Danger:**
+Using the **Delete user and contributions** option may result
 in removing more data than intended. Please see [associated records](#associated-records)
 below for additional details.
 
diff --git a/doc/user/project/clusters/add_remove_clusters.md b/doc/user/project/clusters/add_remove_clusters.md
index 5f5c5868900..65f1c59f4ca 100644
--- a/doc/user/project/clusters/add_remove_clusters.md
+++ b/doc/user/project/clusters/add_remove_clusters.md
@@ -308,7 +308,8 @@ integration to work properly.
 
 ![rbac](img/rbac_v13_1.png)
 
-NOTE: **Note:** Disabling RBAC means that any application running in the cluster,
+NOTE: **Note:**
+Disabling RBAC means that any application running in the cluster,
 or user who can authenticate to the cluster, has full API access. This is a
 [security concern](index.md#security-implications), and may not be desirable.
 
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index b99925f8e5d..ddcfd376d89 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -275,7 +275,8 @@ For **non**-GitLab-managed clusters, the namespace can be customized using
 [`environment:kubernetes:namespace`](../../../ci/environments/index.md#configuring-kubernetes-deployments)
 in `.gitlab-ci.yml`.
 
-NOTE: **Note:** When using a [GitLab-managed cluster](#gitlab-managed-clusters), the
+NOTE: **Note:**
+When using a [GitLab-managed cluster](#gitlab-managed-clusters), the
 namespaces are created automatically prior to deployment and [can not be
 customized](https://gitlab.com/gitlab-org/gitlab/-/issues/38054).
 
@@ -351,7 +352,7 @@ Reasons for failure include:
   [`environment:name`](../../../ci/environments/index.md#defining-environments). If your job has no
   `environment:name` set, it will not be passed the Kubernetes credentials.
 
-NOTE: **NOTE:**
+NOTE: **Note:**
 Project-level clusters upgraded from GitLab 12.0 or older may be configured
 in a way that causes this error. Ensure you deselect the
 [GitLab-managed cluster](#gitlab-managed-clusters) option if you want to manage
diff --git a/doc/user/project/integrations/prometheus_library/nginx_ingress.md b/doc/user/project/integrations/prometheus_library/nginx_ingress.md
index b2bc217e8bf..7bebe7b1e65 100644
--- a/doc/user/project/integrations/prometheus_library/nginx_ingress.md
+++ b/doc/user/project/integrations/prometheus_library/nginx_ingress.md
@@ -8,7 +8,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/22133) in GitLab 11.7.
 
-NOTE: **Note:** NGINX Ingress versions prior to 0.16.0 offer an included [VTS Prometheus metrics exporter](nginx_ingress_vts.md), which exports metrics different than the built-in metrics.
+NOTE: **Note:**
+NGINX Ingress versions prior to 0.16.0 offer an included [VTS Prometheus metrics exporter](nginx_ingress_vts.md), which exports metrics different than the built-in metrics.
 
 GitLab has support for automatically detecting and monitoring the Kubernetes NGINX Ingress controller. This is provided by leveraging the built-in Prometheus metrics included with Kubernetes NGINX Ingress controller [version 0.16.0](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0160) onward.
 
diff --git a/doc/user/project/integrations/prometheus_library/nginx_ingress_vts.md b/doc/user/project/integrations/prometheus_library/nginx_ingress_vts.md
index 6ba0a7610f6..326931e9790 100644
--- a/doc/user/project/integrations/prometheus_library/nginx_ingress_vts.md
+++ b/doc/user/project/integrations/prometheus_library/nginx_ingress_vts.md
@@ -8,7 +8,8 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/13438) in GitLab 9.5.
 
-NOTE: **Note:** [NGINX Ingress version 0.16](nginx_ingress.md) and above have built-in Prometheus metrics, which are different than the VTS based metrics.
+NOTE: **Note:**
+[NGINX Ingress version 0.16](nginx_ingress.md) and above have built-in Prometheus metrics, which are different than the VTS based metrics.
 
 GitLab has support for automatically detecting and monitoring the Kubernetes NGINX Ingress controller. This is provided by leveraging the included VTS Prometheus metrics exporter in [version 0.9.0](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#09-beta1) through [0.15.x](https://github.com/kubernetes/ingress-nginx/blob/master/Changelog.md#0150).
 
diff --git a/doc/user/project/issues/crosslinking_issues.md b/doc/user/project/issues/crosslinking_issues.md
index 6cc31a45309..c721bef8f4d 100644
--- a/doc/user/project/issues/crosslinking_issues.md
+++ b/doc/user/project/issues/crosslinking_issues.md
@@ -31,7 +31,8 @@ git commit -m "this is my commit message. Related to https://gitlab.com/<usernam
 
 Of course, you can replace `gitlab.com` with the URL of your own GitLab instance.
 
-NOTE: **Note:** Linking your first commit to your issue is going to be relevant
+NOTE: **Note:**
+Linking your first commit to your issue is going to be relevant
 for tracking your process with [GitLab Cycle Analytics](https://about.gitlab.com/stages-devops-lifecycle/value-stream-analytics/).
 It will measure the time taken for planning the implementation of that issue,
 which is the time between creating an issue and making the first commit.
diff --git a/doc/user/project/issues/csv_import.md b/doc/user/project/issues/csv_import.md
index d67b135186f..807f4fcffdf 100644
--- a/doc/user/project/issues/csv_import.md
+++ b/doc/user/project/issues/csv_import.md
@@ -7,7 +7,8 @@ Issues can be imported to a project by uploading a CSV file with the columns
 
 The user uploading the CSV file will be set as the author of the imported issues.
 
-NOTE: **Note:** A permission level of [Developer](../../permissions.md), or higher, is required
+NOTE: **Note:**
+A permission level of [Developer](../../permissions.md), or higher, is required
 to import issues.
 
 ## Prepare for the import
diff --git a/doc/user/project/labels.md b/doc/user/project/labels.md
index 6f783d7e847..9886ef91f16 100644
--- a/doc/user/project/labels.md
+++ b/doc/user/project/labels.md
@@ -94,7 +94,7 @@ also be merged.
 All issues, merge requests, issue board lists, issue board filters, and label subscriptions
 with the old labels will be assigned to the new group label.
 
-WARNING: **Caution:**
+CAUTION: **Caution:**
 Promoting a label is a permanent action, and cannot be reversed.
 
 To promote a project label to a group label:
diff --git a/doc/user/project/repository/x509_signed_commits/index.md b/doc/user/project/repository/x509_signed_commits/index.md
index d55d5c5c2d8..ffbad4e0989 100644
--- a/doc/user/project/repository/x509_signed_commits/index.md
+++ b/doc/user/project/repository/x509_signed_commits/index.md
@@ -25,9 +25,11 @@ For a commit or tag to be *verified* by GitLab:
   which is usually up to three years.
 - The signing time is equal or later then commit time.
 
-NOTE: **Note:** Certificate revocation lists are checked on a daily basis via background worker.
+NOTE: **Note:**
+Certificate revocation lists are checked on a daily basis via background worker.
 
-NOTE: **Note:** Self signed certificates without `authorityKeyIdentifier`,
+NOTE: **Note:**
+Self signed certificates without `authorityKeyIdentifier`,
 `subjectKeyIdentifier`, and `crlDistributionPoints` are not supported. We
 recommend using certificates from a PKI that are in line with
 [RFC 5280](https://tools.ietf.org/html/rfc5280).
diff --git a/doc/user/project/web_ide/index.md b/doc/user/project/web_ide/index.md
index 835ce58a766..81f36317b0c 100644
--- a/doc/user/project/web_ide/index.md
+++ b/doc/user/project/web_ide/index.md
@@ -41,7 +41,8 @@ The Web IDE currently provides:
   [JSON Schema Store](https://www.schemastore.org/json/). This feature
   is only supported for the `.gitlab-ci.yml` file.
 
-  NOTE: **Note:** Validation support based on schemas is hidden behind
+  NOTE: **Note:**
+  Validation support based on schemas is hidden behind
   the feature flag `:schema_linting` on self-managed installations. To enable the
   feature, you can [turn on the feature flag in Rails console](../../../administration/feature_flags.md#how-to-enable-and-disable-features-behind-flags).
 
@@ -232,7 +233,8 @@ terminal will block the job from finishing for the duration configured in
 [`[session_server].session_timeout`](https://docs.gitlab.com/runner/configuration/advanced-configuration.html#the-session_server-section)
 until you close the terminal window.
 
-NOTE: **Note:** Not all executors are
+NOTE: **Note:**
+Not all executors are
 [supported](https://docs.gitlab.com/runner/executors/#compatibility-chart).
 The [File Sync](#file-syncing-to-web-terminal) feature is supported on Kubernetes runners only.
 
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index d4defadb04d..bb05206ec02 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -601,6 +601,16 @@ msgstr ""
 msgid "%{retryButtonStart}Try again%{retryButtonEnd} or %{newFileButtonStart}attach a new file%{newFileButtonEnd}"
 msgstr ""
 
+msgid "%{securityScanner} is not enabled for this project. %{linkStart}More information%{linkEnd}"
+msgid_plural "%{securityScanner} are not enabled for this project. %{linkStart}More information%{linkEnd}"
+msgstr[0] ""
+msgstr[1] ""
+
+msgid "%{securityScanner} result is not available because a pipeline has not been run since it was enabled. %{linkStart}Run a pipeline%{linkEnd}"
+msgid_plural "%{securityScanner} results are not available because a pipeline has not been run since it was enabled. %{linkStart}Run a pipeline%{linkEnd}"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%{service_title} %{message}."
 msgstr ""
 
@@ -3229,6 +3239,9 @@ msgstr ""
 msgid "Assigned Merge Requests"
 msgstr ""
 
+msgid "Assigned to %{assigneeName}"
+msgstr ""
+
 msgid "Assigned to %{assignee_name}"
 msgstr ""
 
@@ -9366,6 +9379,9 @@ msgstr ""
 msgid "Error loading file viewer."
 msgstr ""
 
+msgid "Error loading issues"
+msgstr ""
+
 msgid "Error loading last commit."
 msgstr ""
 
@@ -15715,6 +15731,9 @@ msgstr ""
 msgid "No iteration"
 msgstr ""
 
+msgid "No iterations found"
+msgstr ""
+
 msgid "No iterations to show"
 msgstr ""
 
diff --git a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
index 7cbb4bca943..73bb6aeb5fd 100644
--- a/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
+++ b/qa/qa/specs/features/browser_ui/non_devops/performance_bar_spec.rb
@@ -2,7 +2,7 @@
 
 module QA
   RSpec.describe 'Non-devops' do
-    describe 'Performance bar display', :requires_admin do
+    describe 'Performance bar display', :requires_admin, :skip_live_env do
       context 'when logged in as an admin user' do
         # performance metrics: pg, gitaly, redis, rugged (feature flagged), total (not always provided)
         let(:minimum_metrics_count) { 3 }
diff --git a/qa/qa/specs/helpers/quarantine.rb b/qa/qa/specs/helpers/quarantine.rb
index 5ba39346344..6a3becf0ee5 100644
--- a/qa/qa/specs/helpers/quarantine.rb
+++ b/qa/qa/specs/helpers/quarantine.rb
@@ -20,7 +20,7 @@ module QA
               Quarantine.skip_or_run_quarantined_tests_or_contexts(config.inclusion_filter.rules, example)
 
               if example.metadata.key?(:only)
-                skip('Test is not compatible with this environment') unless Runtime::Env.dot_com?(example.metadata[:only])
+                skip('Test is not compatible with this environment') unless Runtime::Env.address_matches?(example.metadata[:only])
               end
             end
           end
@@ -50,21 +50,15 @@ module QA
             skip("Only running tests tagged with :quarantine and any of #{included_filters.keys}") if should_skip_when_focused?(example.metadata, included_filters)
           else
             if example.metadata.key?(:quarantine)
-              quarantine_message = %w(In quarantine)
               quarantine_tag = example.metadata[:quarantine]
 
-              if !!quarantine_tag
-                quarantine_message << case quarantine_tag
-                                      when String
-                                        ": #{quarantine_tag}"
-                                      when Hash
-                                        ": #{quarantine_tag[:issue]}"
-                                      else
-                                        ''
-                                      end
+              if quarantine_tag&.is_a?(Hash) && quarantine_tag&.key?(:only)
+                # If the :quarantine hash contains :only, we respect that.
+                # For instance `quarantine: { only: { subdomain: :staging } }` will only quarantine the test when it runs against staging.
+                return unless Runtime::Env.address_matches?(quarantine_tag[:only])
               end
 
-              skip(quarantine_message.join(' ').strip)
+              skip(quarantine_message(quarantine_tag))
             end
           end
         end
@@ -73,6 +67,20 @@ module QA
           filter.reject { |key, _| key == :quarantine }
         end
 
+        def quarantine_message(quarantine_tag)
+          quarantine_message = %w(In quarantine)
+          quarantine_message << case quarantine_tag
+                                when String
+                                  ": #{quarantine_tag}"
+                                when Hash
+                                  quarantine_tag.key?(:issue) ? ": #{quarantine_tag[:issue]}" : ''
+                                else
+                                  ''
+                                end
+
+          quarantine_message.join(' ').strip
+        end
+
         # Checks if a test or context should be skipped.
         #
         # Returns true if
diff --git a/qa/spec/specs/helpers/quarantine_spec.rb b/qa/spec/specs/helpers/quarantine_spec.rb
index f42cb43ed98..9686a9771c4 100644
--- a/qa/spec/specs/helpers/quarantine_spec.rb
+++ b/qa/spec/specs/helpers/quarantine_spec.rb
@@ -124,7 +124,7 @@ describe QA::Specs::Helpers::Quarantine do
     end
   end
 
-  describe '.skip_or_run_quarantined_tests' do
+  describe '.skip_or_run_quarantined_tests_or_contexts' do
     context 'with no tag focused' do
       before do
         described_class.configure_rspec
@@ -148,6 +148,37 @@ describe QA::Specs::Helpers::Quarantine do
         expect(group.examples.first.execution_result.status).to eq(:passed)
       end
 
+      context 'with environment set' do
+        before do
+          QA::Runtime::Scenario.define(:gitlab_address, 'https://staging.gitlab.com')
+          described_class.configure_rspec
+        end
+
+        it 'is skipped when set on contexts or descriptions' do
+          group = describe_successfully 'Quarantined in staging', quarantine: { only: { subdomain: :staging } } do
+            it('runs in staging') {}
+          end
+
+          expect(group.examples.first.execution_result.status).to eq(:pending)
+          expect(group.examples.first.execution_result.pending_message)
+            .to eq('In quarantine')
+        end
+
+        it 'is skipped only in staging' do
+          group = describe_successfully do
+            it('skipped in staging', quarantine: { only: { subdomain: :staging } }) {}
+            it('runs in staging', quarantine: { only: :production }) {}
+            it('skipped in staging also', quarantine: { only: { subdomain: %i[release staging] } }) {}
+            it('runs in any env') {}
+          end
+
+          expect(group.examples[0].execution_result.status).to eq(:pending)
+          expect(group.examples[1].execution_result.status).to eq(:passed)
+          expect(group.examples[2].execution_result.status).to eq(:pending)
+          expect(group.examples[3].execution_result.status).to eq(:passed)
+        end
+      end
+
       context 'quarantine message' do
         shared_examples 'test with quarantine message' do |quarantine_tag|
           it 'outputs the quarantine message' do
diff --git a/spec/frontend/awards_handler_spec.js b/spec/frontend/awards_handler_spec.js
index ef09c59b5f6..6cfbc6024af 100644
--- a/spec/frontend/awards_handler_spec.js
+++ b/spec/frontend/awards_handler_spec.js
@@ -3,64 +3,51 @@ import Cookies from 'js-cookie';
 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
 import loadAwardsHandler from '~/awards_handler';
-import '~/lib/utils/common_utils';
-import waitForPromises from './helpers/wait_for_promises';
+import { setTestTimeout } from './helpers/timeout';
 import { EMOJI_VERSION } from '~/emoji';
+import { useFakeRequestAnimationFrame } from 'helpers/fake_request_animation_frame';
 
 window.gl = window.gl || {};
 window.gon = window.gon || {};
 
-let openAndWaitForEmojiMenu;
 let mock;
 let awardsHandler = null;
 const urlRoot = gon.relative_url_root;
 
-const lazyAssert = (done, assertFn) => {
-  jest.runOnlyPendingTimers();
-  waitForPromises()
-    .then(() => {
-      assertFn();
-      done();
-    })
-    .catch(e => {
-      throw e;
-    });
-};
-
 describe('AwardsHandler', () => {
+  useFakeRequestAnimationFrame();
+
   const emojiData = getJSONFixture('emojis/emojis.json');
   preloadFixtures('snippets/show.html');
 
-  beforeEach(done => {
+  const openAndWaitForEmojiMenu = (sel = '.js-add-award') => {
+    $(sel)
+      .eq(0)
+      .click();
+
+    jest.advanceTimersByTime(200);
+
+    const $menu = $('.emoji-menu');
+
+    return new Promise(resolve => {
+      $menu.one('build-emoji-menu-finish', () => {
+        resolve();
+      });
+    });
+  };
+
+  beforeEach(async () => {
+    // These tests have had some timeout issues
+    // https://gitlab.com/gitlab-org/gitlab/-/issues/221086
+    setTestTimeout(6000);
+
     mock = new MockAdapter(axios);
     mock.onGet(`/-/emojis/${EMOJI_VERSION}/emojis.json`).reply(200, emojiData);
 
     loadFixtures('snippets/show.html');
-    loadAwardsHandler(true)
-      .then(obj => {
-        awardsHandler = obj;
-        jest.spyOn(awardsHandler, 'postEmoji').mockImplementation((button, url, emoji, cb) => cb());
-        done();
-      })
-      .catch(done.fail);
 
-    let isEmojiMenuBuilt = false;
-    openAndWaitForEmojiMenu = () => {
-      return new Promise(resolve => {
-        if (isEmojiMenuBuilt) {
-          resolve();
-        } else {
-          $('.js-add-award')
-            .eq(0)
-            .click();
-          const $menu = $('.emoji-menu');
-          $menu.one('build-emoji-menu-finish', () => {
-            isEmojiMenuBuilt = true;
-            resolve();
-          });
-        }
-      });
-    };
+    awardsHandler = await loadAwardsHandler(true);
+    jest.spyOn(awardsHandler, 'postEmoji').mockImplementation((button, url, emoji, cb) => cb());
   });
 
   afterEach(() => {
@@ -76,55 +63,45 @@ describe('AwardsHandler', () => {
   });
 
   describe('::showEmojiMenu', () => {
-    it('should show emoji menu when Add emoji button clicked', done => {
-      $('.js-add-award')
-        .eq(0)
-        .click();
-      lazyAssert(done, () => {
-        const $emojiMenu = $('.emoji-menu');
+    it('should show emoji menu when Add emoji button clicked', async () => {
+      await openAndWaitForEmojiMenu();
 
-        expect($emojiMenu.length).toBe(1);
-        expect($emojiMenu.hasClass('is-visible')).toBe(true);
-        expect($emojiMenu.find('.js-emoji-menu-search').length).toBe(1);
-        expect($('.js-awards-block.current').length).toBe(1);
-      });
+      const $emojiMenu = $('.emoji-menu');
+
+      expect($emojiMenu.length).toBe(1);
+      expect($emojiMenu.hasClass('is-visible')).toBe(true);
+      expect($emojiMenu.find('.js-emoji-menu-search').length).toBe(1);
+      expect($('.js-awards-block.current').length).toBe(1);
     });
 
-    it('should also show emoji menu for the smiley icon in notes', done => {
-      $('.js-add-award.note-action-button').click();
-      lazyAssert(done, () => {
-        const $emojiMenu = $('.emoji-menu');
+    it('should also show emoji menu for the smiley icon in notes', async () => {
+      await openAndWaitForEmojiMenu('.js-add-award.note-action-button');
 
-        expect($emojiMenu.length).toBe(1);
-      });
+      const $emojiMenu = $('.emoji-menu');
+
+      expect($emojiMenu.length).toBe(1);
     });
 
-    it('should remove emoji menu when body is clicked', done => {
-      $('.js-add-award')
-        .eq(0)
-        .click();
-      lazyAssert(done, () => {
-        const $emojiMenu = $('.emoji-menu');
-        $('body').click();
+    it('should remove emoji menu when body is clicked', async () => {
+      await openAndWaitForEmojiMenu();
 
-        expect($emojiMenu.length).toBe(1);
-        expect($emojiMenu.hasClass('is-visible')).toBe(false);
-        expect($('.js-awards-block.current').length).toBe(0);
-      });
+      const $emojiMenu = $('.emoji-menu');
+      $('body').click();
+
+      expect($emojiMenu.length).toBe(1);
+      expect($emojiMenu.hasClass('is-visible')).toBe(false);
+      expect($('.js-awards-block.current').length).toBe(0);
     });
 
-    it('should not remove emoji menu when search is clicked', done => {
-      $('.js-add-award')
-        .eq(0)
-        .click();
-      lazyAssert(done, () => {
-        const $emojiMenu = $('.emoji-menu');
-        $('.emoji-search').click();
+    it('should not remove emoji menu when search is clicked', async () => {
+      await openAndWaitForEmojiMenu();
 
-        expect($emojiMenu.length).toBe(1);
-        expect($emojiMenu.hasClass('is-visible')).toBe(true);
-        expect($('.js-awards-block.current').length).toBe(1);
-      });
+      const $emojiMenu = $('.emoji-menu');
+      $('.emoji-search').click();
+
+      expect($emojiMenu.length).toBe(1);
+      expect($emojiMenu.hasClass('is-visible')).toBe(true);
+      expect($('.js-awards-block.current').length).toBe(1);
     });
   });
 
@@ -272,48 +249,39 @@ describe('AwardsHandler', () => {
   });
 
   describe('::searchEmojis', () => {
-    it('should filter the emoji', done => {
-      openAndWaitForEmojiMenu()
-        .then(() => {
-          expect($('[data-name=angel]').is(':visible')).toBe(true);
-          expect($('[data-name=anger]').is(':visible')).toBe(true);
-          awardsHandler.searchEmojis('ali');
+    it('should filter the emoji', async () => {
+      await openAndWaitForEmojiMenu();
 
-          expect($('[data-name=angel]').is(':visible')).toBe(false);
-          expect($('[data-name=anger]').is(':visible')).toBe(false);
-          expect($('[data-name=alien]').is(':visible')).toBe(true);
-          expect($('.js-emoji-menu-search').val()).toBe('ali');
-        })
-        .then(done)
-        .catch(err => {
-          done.fail(`Failed to open and build emoji menu: ${err.message}`);
-        });
+      expect($('[data-name=angel]').is(':visible')).toBe(true);
+      expect($('[data-name=anger]').is(':visible')).toBe(true);
+      awardsHandler.searchEmojis('ali');
+
+      expect($('[data-name=angel]').is(':visible')).toBe(false);
+      expect($('[data-name=anger]').is(':visible')).toBe(false);
+      expect($('[data-name=alien]').is(':visible')).toBe(true);
+      expect($('.js-emoji-menu-search').val()).toBe('ali');
     });
 
-    it('should clear the search when searching for nothing', done => {
-      openAndWaitForEmojiMenu()
-        .then(() => {
-          awardsHandler.searchEmojis('ali');
+    it('should clear the search when searching for nothing', async () => {
+      await openAndWaitForEmojiMenu();
 
-          expect($('[data-name=angel]').is(':visible')).toBe(false);
-          expect($('[data-name=anger]').is(':visible')).toBe(false);
-          expect($('[data-name=alien]').is(':visible')).toBe(true);
-          awardsHandler.searchEmojis('');
+      awardsHandler.searchEmojis('ali');
 
-          expect($('[data-name=angel]').is(':visible')).toBe(true);
-          expect($('[data-name=anger]').is(':visible')).toBe(true);
-          expect($('[data-name=alien]').is(':visible')).toBe(true);
-          expect($('.js-emoji-menu-search').val()).toBe('');
-        })
-        .then(done)
-        .catch(err => {
-          done.fail(`Failed to open and build emoji menu: ${err.message}`);
-        });
+      expect($('[data-name=angel]').is(':visible')).toBe(false);
+      expect($('[data-name=anger]').is(':visible')).toBe(false);
+      expect($('[data-name=alien]').is(':visible')).toBe(true);
+      awardsHandler.searchEmojis('');
+
+      expect($('[data-name=angel]').is(':visible')).toBe(true);
+      expect($('[data-name=anger]').is(':visible')).toBe(true);
+      expect($('[data-name=alien]').is(':visible')).toBe(true);
+      expect($('.js-emoji-menu-search').val()).toBe('');
     });
   });
 
   describe('emoji menu', () => {
     const emojiSelector = '[data-name="sunglasses"]';
+
     const openEmojiMenuAndAddEmoji = () => {
       return openAndWaitForEmojiMenu().then(() => {
         const $menu = $('.emoji-menu');
@@ -329,32 +297,23 @@ describe('AwardsHandler', () => {
       });
     };
 
-    it('should add selected emoji to awards block', done => {
-      openEmojiMenuAndAddEmoji()
-        .then(done)
-        .catch(err => {
-          done.fail(`Failed to open and build emoji menu: ${err.message}`);
-        });
+    it('should add selected emoji to awards block', async () => {
+      await openEmojiMenuAndAddEmoji();
     });
 
-    it('should remove already selected emoji', done => {
-      openEmojiMenuAndAddEmoji()
-        .then(() => {
-          $('.js-add-award')
-            .eq(0)
-            .click();
-          const $block = $('.js-awards-block');
-          const $emoji = $('.emoji-menu').find(
-            `.emoji-menu-list:not(.frequent-emojis) ${emojiSelector}`,
-          );
-          $emoji.click();
+    it('should remove already selected emoji', async () => {
+      await openEmojiMenuAndAddEmoji();
 
-          expect($block.find(emojiSelector).length).toBe(0);
-        })
-        .then(done)
-        .catch(err => {
-          done.fail(`Failed to open and build emoji menu: ${err.message}`);
-        });
+      $('.js-add-award')
+        .eq(0)
+        .click();
+      const $block = $('.js-awards-block');
+      const $emoji = $('.emoji-menu').find(
+        `.emoji-menu-list:not(.frequent-emojis) ${emojiSelector}`,
+      );
+      $emoji.click();
+
+      expect($block.find(emojiSelector).length).toBe(0);
     });
   });
 
@@ -364,37 +323,27 @@ describe('AwardsHandler', () => {
       Cookies.set('frequently_used_emojis', '');
     });
 
-    it('shouldn\'t have any "Frequently used" heading if no frequently used emojis', done => {
-      return openAndWaitForEmojiMenu()
-        .then(() => {
-          const emojiMenu = document.querySelector('.emoji-menu');
-          Array.prototype.forEach.call(emojiMenu.querySelectorAll('.emoji-menu-title'), title => {
-            expect(title.textContent.trim().toLowerCase()).not.toBe('frequently used');
-          });
-        })
-        .then(done)
-        .catch(err => {
-          done.fail(`Failed to open and build emoji menu: ${err.message}`);
-        });
+    it('shouldn\'t have any "Frequently used" heading if no frequently used emojis', async () => {
+      await openAndWaitForEmojiMenu();
+
+      const emojiMenu = document.querySelector('.emoji-menu');
+      Array.prototype.forEach.call(emojiMenu.querySelectorAll('.emoji-menu-title'), title => {
+        expect(title.textContent.trim().toLowerCase()).not.toBe('frequently used');
+      });
     });
 
-    it('should have any frequently used section when there are frequently used emojis', done => {
+    it('should have any frequently used section when there are frequently used emojis', async () => {
       awardsHandler.addEmojiToFrequentlyUsedList('8ball');
 
-      return openAndWaitForEmojiMenu()
-        .then(() => {
-          const emojiMenu = document.querySelector('.emoji-menu');
-          const hasFrequentlyUsedHeading = Array.prototype.some.call(
-            emojiMenu.querySelectorAll('.emoji-menu-title'),
-            title => title.textContent.trim().toLowerCase() === 'frequently used',
-          );
+      await openAndWaitForEmojiMenu();
 
-          expect(hasFrequentlyUsedHeading).toBe(true);
-        })
-        .then(done)
-        .catch(err => {
-          done.fail(`Failed to open and build emoji menu: ${err.message}`);
-        });
+      const emojiMenu = document.querySelector('.emoji-menu');
+      const hasFrequentlyUsedHeading = Array.prototype.some.call(
+        emojiMenu.querySelectorAll('.emoji-menu-title'),
+        title => title.textContent.trim().toLowerCase() === 'frequently used',
+      );
+
+      expect(hasFrequentlyUsedHeading).toBe(true);
     });
 
     it('should disregard invalid frequently used emoji that are being attempted to be added', () => {
diff --git a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
index 005b2c5da1c..0f5b3cd3f5e 100644
--- a/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
+++ b/spec/frontend/blob/components/__snapshots__/blob_header_filepath_spec.js.snap
@@ -8,6 +8,7 @@ exports[`Blob Header Filepath rendering matches the snapshot 1`] = `
   <file-icon-stub
     aria-hidden="true"
     cssclasses="mr-2"
+    filemode=""
     filename="foo/bar/dummy.md"
     size="18"
   />
diff --git a/spec/frontend/diffs/components/inline_diff_table_row_spec.js b/spec/frontend/diffs/components/inline_diff_table_row_spec.js
index 66349727b11..f929f97b598 100644
--- a/spec/frontend/diffs/components/inline_diff_table_row_spec.js
+++ b/spec/frontend/diffs/components/inline_diff_table_row_spec.js
@@ -1,27 +1,31 @@
-import Vue from 'vue';
-import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
+import { shallowMount } from '@vue/test-utils';
 import { createStore } from '~/mr_notes/stores';
 import InlineDiffTableRow from '~/diffs/components/inline_diff_table_row.vue';
 import diffFileMockData from '../mock_data/diff_file';
 
 describe('InlineDiffTableRow', () => {
+  let wrapper;
   let vm;
   const thisLine = diffFileMockData.highlighted_diff_lines[0];
 
   beforeEach(() => {
-    vm = createComponentWithStore(Vue.extend(InlineDiffTableRow), createStore(), {
-      line: thisLine,
-      fileHash: diffFileMockData.file_hash,
-      filePath: diffFileMockData.file_path,
-      contextLinesPath: 'contextLinesPath',
-      isHighlighted: false,
-    }).$mount();
+    wrapper = shallowMount(InlineDiffTableRow, {
+      store: createStore(),
+      propsData: {
+        line: thisLine,
+        fileHash: diffFileMockData.file_hash,
+        filePath: diffFileMockData.file_path,
+        contextLinesPath: 'contextLinesPath',
+        isHighlighted: false,
+      },
+    });
+    vm = wrapper.vm;
   });
 
   it('does not add hll class to line content when line does not match highlighted row', done => {
     vm.$nextTick()
       .then(() => {
-        expect(vm.$el.querySelector('.line_content').classList).not.toContain('hll');
+        expect(wrapper.find('.line_content').classes('hll')).toBe(false);
       })
       .then(done)
       .catch(done.fail);
@@ -35,12 +39,19 @@ describe('InlineDiffTableRow', () => {
         return vm.$nextTick();
       })
       .then(() => {
-        expect(vm.$el.querySelector('.line_content').classList).toContain('hll');
+        expect(wrapper.find('.line_content').classes('hll')).toBe(true);
       })
       .then(done)
       .catch(done.fail);
   });
 
+  it('adds hll class to lineContent when line is part of a multiline comment', () => {
+    wrapper.setProps({ isCommented: true });
+    return vm.$nextTick().then(() => {
+      expect(wrapper.find('.line_content').classes('hll')).toBe(true);
+    });
+  });
+
   describe('sets coverage title and class', () => {
     it('for lines with coverage', done => {
       vm.$nextTick()
@@ -53,10 +64,10 @@ describe('InlineDiffTableRow', () => {
           return vm.$nextTick();
         })
         .then(() => {
-          const coverage = vm.$el.querySelector('.line-coverage');
+          const coverage = wrapper.find('.line-coverage');
 
-          expect(coverage.title).toContain('Test coverage: 5 hits');
-          expect(coverage.classList).toContain('coverage');
+          expect(coverage.attributes('title')).toContain('Test coverage: 5 hits');
+          expect(coverage.classes('coverage')).toBe(true);
         })
         .then(done)
         .catch(done.fail);
@@ -73,10 +84,10 @@ describe('InlineDiffTableRow', () => {
           return vm.$nextTick();
         })
         .then(() => {
-          const coverage = vm.$el.querySelector('.line-coverage');
+          const coverage = wrapper.find('.line-coverage');
 
-          expect(coverage.title).toContain('No test coverage');
-          expect(coverage.classList).toContain('no-coverage');
+          expect(coverage.attributes('title')).toContain('No test coverage');
+          expect(coverage.classes('no-coverage')).toBe(true);
         })
         .then(done)
         .catch(done.fail);
@@ -90,11 +101,11 @@ describe('InlineDiffTableRow', () => {
           return vm.$nextTick();
         })
         .then(() => {
-          const coverage = vm.$el.querySelector('.line-coverage');
+          const coverage = wrapper.find('.line-coverage');
 
-          expect(coverage.title).not.toContain('Coverage');
-          expect(coverage.classList).not.toContain('coverage');
-          expect(coverage.classList).not.toContain('no-coverage');
+          expect(coverage.attributes('title')).toBeUndefined();
+          expect(coverage.classes('coverage')).toBe(false);
+          expect(coverage.classes('no-coverage')).toBe(false);
         })
         .then(done)
         .catch(done.fail);
diff --git a/spec/frontend/diffs/components/parallel_diff_table_row_spec.js b/spec/frontend/diffs/components/parallel_diff_table_row_spec.js
index 6b92d448cf5..339352943a9 100644
--- a/spec/frontend/diffs/components/parallel_diff_table_row_spec.js
+++ b/spec/frontend/diffs/components/parallel_diff_table_row_spec.js
@@ -1,4 +1,5 @@
 import Vue from 'vue';
+import { shallowMount } from '@vue/test-utils';
 import { createComponentWithStore } from 'helpers/vue_mount_component_helper';
 import { createStore } from '~/mr_notes/stores';
 import ParallelDiffTableRow from '~/diffs/components/parallel_diff_table_row.vue';
@@ -6,18 +7,24 @@ import diffFileMockData from '../mock_data/diff_file';
 
 describe('ParallelDiffTableRow', () => {
   describe('when one side is empty', () => {
+    let wrapper;
     let vm;
     const thisLine = diffFileMockData.parallel_diff_lines[0];
     const rightLine = diffFileMockData.parallel_diff_lines[0].right;
 
     beforeEach(() => {
-      vm = createComponentWithStore(Vue.extend(ParallelDiffTableRow), createStore(), {
-        line: thisLine,
-        fileHash: diffFileMockData.file_hash,
-        filePath: diffFileMockData.file_path,
-        contextLinesPath: 'contextLinesPath',
-        isHighlighted: false,
-      }).$mount();
+      wrapper = shallowMount(ParallelDiffTableRow, {
+        store: createStore(),
+        propsData: {
+          line: thisLine,
+          fileHash: diffFileMockData.file_hash,
+          filePath: diffFileMockData.file_path,
+          contextLinesPath: 'contextLinesPath',
+          isHighlighted: false,
+        },
+      });
+
+      vm = wrapper.vm;
     });
 
     it('does not highlight non empty line content when line does not match highlighted row', done => {
@@ -42,6 +49,13 @@ describe('ParallelDiffTableRow', () => {
         .then(done)
         .catch(done.fail);
     });
+
+    it('highlights nonempty line content when line is part of a multiline comment', () => {
+      wrapper.setProps({ isCommented: true });
+      return vm.$nextTick().then(() => {
+        expect(vm.$el.querySelector('.line_content.right-side').classList).toContain('hll');
+      });
+    });
   });
 
   describe('when both sides have content', () => {
diff --git a/spec/frontend/helpers/fake_request_animation_frame.js b/spec/frontend/helpers/fake_request_animation_frame.js
new file mode 100644
index 00000000000..b01ae5b7c5f
--- /dev/null
+++ b/spec/frontend/helpers/fake_request_animation_frame.js
@@ -0,0 +1,13 @@
+// eslint-disable-next-line import/prefer-default-export
+export const useFakeRequestAnimationFrame = () => {
+  let orig;
+
+  beforeEach(() => {
+    orig = global.requestAnimationFrame;
+    global.requestAnimationFrame = cb => cb();
+  });
+
+  afterEach(() => {
+    global.requestAnimationFrame = orig;
+  });
+};
diff --git a/spec/frontend/notes/components/multiline_comment_utils_spec.js b/spec/frontend/notes/components/multiline_comment_utils_spec.js
index 4afb8d97671..af4394cc648 100644
--- a/spec/frontend/notes/components/multiline_comment_utils_spec.js
+++ b/spec/frontend/notes/components/multiline_comment_utils_spec.js
@@ -2,6 +2,7 @@ import {
   getSymbol,
   getStartLineNumber,
   getEndLineNumber,
+  getCommentedLines,
 } from '~/notes/components/multiline_comment_utils';
 
 describe('Multiline comment utilities', () => {
@@ -33,4 +34,30 @@ describe('Multiline comment utilities', () => {
       expect(getSymbol(type)).toEqual(result);
     });
   });
+  describe('getCommentedLines', () => {
+    const diffLines = [{ line_code: '1' }, { line_code: '2' }, { line_code: '3' }];
+    it('returns a default object when `selectedCommentPosition` is not provided', () => {
+      expect(getCommentedLines(undefined, diffLines)).toEqual({ startLine: 4, endLine: 4 });
+    });
+    it('returns an object with startLine and endLine equal to 0', () => {
+      const selectedCommentPosition = {
+        start: { line_code: '1' },
+        end: { line_code: '1' },
+      };
+      expect(getCommentedLines(selectedCommentPosition, diffLines)).toEqual({
+        startLine: 0,
+        endLine: 0,
+      });
+    });
+    it('returns an object with startLine and endLine equal to 0 and 1', () => {
+      const selectedCommentPosition = {
+        start: { line_code: '1' },
+        end: { line_code: '2' },
+      };
+      expect(getCommentedLines(selectedCommentPosition, diffLines)).toEqual({
+        startLine: 0,
+        endLine: 1,
+      });
+    });
+  });
 });
diff --git a/spec/frontend/notes/components/noteable_note_spec.js b/spec/frontend/notes/components/noteable_note_spec.js
index 3cb6cfe9787..6393be4f0ae 100644
--- a/spec/frontend/notes/components/noteable_note_spec.js
+++ b/spec/frontend/notes/components/noteable_note_spec.js
@@ -175,6 +175,7 @@ describe('issue_note', () => {
     store.hotUpdate({
       actions: {
         updateNote() {},
+        setSelectedCommentPositionHover() {},
       },
     });
     const noteBodyComponent = wrapper.find(NoteBody);
diff --git a/spec/frontend/notes/stores/actions_spec.js b/spec/frontend/notes/stores/actions_spec.js
index ac54d6e9e4d..909a4a797ae 100644
--- a/spec/frontend/notes/stores/actions_spec.js
+++ b/spec/frontend/notes/stores/actions_spec.js
@@ -1127,6 +1127,19 @@ describe('Actions Notes Store', () => {
     });
   });
 
+  describe('setSelectedCommentPosition', () => {
+    it('calls the correct mutation with the correct args', done => {
+      testAction(
+        actions.setSelectedCommentPosition,
+        {},
+        {},
+        [{ type: mutationTypes.SET_SELECTED_COMMENT_POSITION, payload: {} }],
+        [],
+        done,
+      );
+    });
+  });
+
   describe('softDeleteDescriptionVersion', () => {
     const endpoint = '/path/to/diff/1';
     const payload = {
diff --git a/spec/frontend/notes/stores/mutation_spec.js b/spec/frontend/notes/stores/mutation_spec.js
index 78cda0d038d..0ad18ba9b6a 100644
--- a/spec/frontend/notes/stores/mutation_spec.js
+++ b/spec/frontend/notes/stores/mutation_spec.js
@@ -524,6 +524,26 @@ describe('Notes Store mutations', () => {
     });
   });
 
+  describe('SET_SELECTED_COMMENT_POSITION', () => {
+    it('should set comment position state', () => {
+      const state = {};
+
+      mutations.SET_SELECTED_COMMENT_POSITION(state, {});
+
+      expect(state.selectedCommentPosition).toEqual({});
+    });
+  });
+
+  describe('SET_SELECTED_COMMENT_POSITION_HOVER', () => {
+    it('should set comment hover position state', () => {
+      const state = {};
+
+      mutations.SET_SELECTED_COMMENT_POSITION_HOVER(state, {});
+
+      expect(state.selectedCommentPositionHover).toEqual({});
+    });
+  });
+
   describe('DISABLE_COMMENTS', () => {
     it('should set comments disabled state', () => {
       const state = {};
diff --git a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
index 97597ed8063..ac60fc4917d 100644
--- a/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
+++ b/spec/frontend/repository/components/table/__snapshots__/row_spec.js.snap
@@ -1,5 +1,58 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Repository table row component renders a symlink table row 1`] = `
+<tr
+  class="tree-item"
+>
+  <td
+    class="tree-item-file-name cursor-default position-relative"
+  >
+    <a
+      class="tree-item-link str-truncated"
+      data-qa-selector="file_name_link"
+      href="https://test.com"
+    >
+      <file-icon-stub
+        class="mr-1 position-relative text-secondary"
+        cssclasses="position-relative file-icon"
+        filemode="120000"
+        filename="test"
+        size="16"
+      />
+      <span
+        class="position-relative"
+      >
+        test
+      </span>
+    </a>
+     
+    <!---->
+     
+    <!---->
+     
+    <!---->
+  </td>
+   
+  <td
+    class="d-none d-sm-table-cell tree-commit cursor-default"
+  >
+    <gl-skeleton-loading-stub
+      class="h-auto"
+      lines="1"
+    />
+  </td>
+   
+  <td
+    class="tree-time-ago text-right cursor-default"
+  >
+    <gl-skeleton-loading-stub
+      class="ml-auto h-auto w-50"
+      lines="1"
+    />
+  </td>
+</tr>
+`;
+
 exports[`Repository table row component renders table row 1`] = `
 <tr
   class="tree-item"
@@ -15,6 +68,7 @@ exports[`Repository table row component renders table row 1`] = `
       <file-icon-stub
         class="mr-1 position-relative text-secondary"
         cssclasses="position-relative file-icon"
+        filemode=""
         filename="test"
         size="16"
       />
@@ -67,6 +121,7 @@ exports[`Repository table row component renders table row for path with special
       <file-icon-stub
         class="mr-1 position-relative text-secondary"
         cssclasses="position-relative file-icon"
+        filemode=""
         filename="test"
         size="16"
       />
diff --git a/spec/frontend/repository/components/table/index_spec.js b/spec/frontend/repository/components/table/index_spec.js
index 9db90839b29..ed50f292b8c 100644
--- a/spec/frontend/repository/components/table/index_spec.js
+++ b/spec/frontend/repository/components/table/index_spec.js
@@ -23,6 +23,15 @@ const MOCK_BLOBS = [
     type: 'blob',
     webUrl: 'http://test.com',
   },
+  {
+    id: '125abc',
+    sha: '125abc',
+    flatPath: 'blob3',
+    name: 'blob3.md',
+    type: 'blob',
+    webUrl: 'http://test.com',
+    mode: '120000',
+  },
 ];
 
 function factory({ path, isLoading = false, entries = {} }) {
@@ -74,7 +83,9 @@ describe('Repository table component', () => {
       },
     });
 
-    expect(vm.find(TableRow).exists()).toBe(true);
-    expect(vm.findAll(TableRow).length).toBe(2);
+    const rows = vm.findAll(TableRow);
+
+    expect(rows.length).toEqual(3);
+    expect(rows.at(2).attributes().mode).toEqual('120000');
   });
 });
diff --git a/spec/frontend/repository/components/table/row_spec.js b/spec/frontend/repository/components/table/row_spec.js
index 800a7e586a8..767b117c798 100644
--- a/spec/frontend/repository/components/table/row_spec.js
+++ b/spec/frontend/repository/components/table/row_spec.js
@@ -2,6 +2,7 @@ import { shallowMount, RouterLinkStub } from '@vue/test-utils';
 import { GlBadge, GlLink, GlIcon } from '@gitlab/ui';
 import TableRow from '~/repository/components/table/row.vue';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
+import { FILE_SYMLINK_MODE } from '~/vue_shared/constants';
 
 let vm;
 let $router;
@@ -48,6 +49,21 @@ describe('Repository table row component', () => {
     });
   });
 
+  it('renders a symlink table row', () => {
+    factory({
+      id: '1',
+      sha: '123',
+      path: 'test',
+      type: 'blob',
+      currentPath: '/',
+      mode: FILE_SYMLINK_MODE,
+    });
+
+    return vm.vm.$nextTick().then(() => {
+      expect(vm.element).toMatchSnapshot();
+    });
+  });
+
   it('renders table row for path with special character', () => {
     factory({
       id: '1',
diff --git a/spec/frontend/vue_shared/components/file_icon_spec.js b/spec/frontend/vue_shared/components/file_icon_spec.js
index 5a385eee60c..adf0da21f9f 100644
--- a/spec/frontend/vue_shared/components/file_icon_spec.js
+++ b/spec/frontend/vue_shared/components/file_icon_spec.js
@@ -1,12 +1,14 @@
 import { shallowMount } from '@vue/test-utils';
 import { GlLoadingIcon, GlIcon } from '@gitlab/ui';
 import FileIcon from '~/vue_shared/components/file_icon.vue';
+import { FILE_SYMLINK_MODE } from '~/vue_shared/constants';
 
 describe('File Icon component', () => {
   let wrapper;
-  const findIcon = () => wrapper.find('svg');
+  const findSvgIcon = () => wrapper.find('svg');
+  const findGlIcon = () => wrapper.find(GlIcon);
   const getIconName = () =>
-    findIcon()
+    findSvgIcon()
       .find('use')
       .element.getAttribute('xlink:href')
       .replace(`${gon.sprite_file_icons}#`, '');
@@ -27,7 +29,7 @@ describe('File Icon component', () => {
     });
 
     expect(wrapper.element.tagName).toEqual('SPAN');
-    expect(findIcon().exists()).toBeDefined();
+    expect(findSvgIcon().exists()).toBeDefined();
   });
 
   it.each`
@@ -46,8 +48,8 @@ describe('File Icon component', () => {
       folder: true,
     });
 
-    expect(findIcon().exists()).toBe(false);
-    expect(wrapper.find(GlIcon).classes()).toContain('folder-icon');
+    expect(findSvgIcon().exists()).toBe(false);
+    expect(findGlIcon().classes()).toContain('folder-icon');
   });
 
   it('should render a loading icon', () => {
@@ -66,8 +68,19 @@ describe('File Icon component', () => {
       cssClasses: 'extraclasses',
       size,
     });
+    const classes = findSvgIcon().classes();
 
-    expect(findIcon().classes()).toContain(`s${size}`);
-    expect(findIcon().classes()).toContain('extraclasses');
+    expect(classes).toContain(`s${size}`);
+    expect(classes).toContain('extraclasses');
+  });
+
+  it('should render a symlink icon', () => {
+    createComponent({
+      fileName: 'anything',
+      fileMode: FILE_SYMLINK_MODE,
+    });
+
+    expect(findSvgIcon().exists()).toBe(false);
+    expect(findGlIcon().attributes('name')).toBe('symlink');
   });
 });
diff --git a/spec/graphql/types/issue_connection_type_spec.rb b/spec/graphql/types/issue_connection_type_spec.rb
new file mode 100644
index 00000000000..af34611ecfe
--- /dev/null
+++ b/spec/graphql/types/issue_connection_type_spec.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe GitlabSchema.types['IssueConnection'] do
+  it 'has the expected fields' do
+    expected_fields = %i[count page_info edges nodes]
+
+    expect(described_class).to have_graphql_fields(*expected_fields)
+  end
+end
diff --git a/spec/graphql/types/issue_type_spec.rb b/spec/graphql/types/issue_type_spec.rb
index 17db6648092..4a86b07ab1c 100644
--- a/spec/graphql/types/issue_type_spec.rb
+++ b/spec/graphql/types/issue_type_spec.rb
@@ -22,6 +22,104 @@ RSpec.describe GitlabSchema.types['Issue'] do
     end
   end
 
+  describe 'pagination and count' do
+    let_it_be(:user) { create(:user) }
+    let_it_be(:project) { create(:project, :public) }
+    let_it_be(:now) { Time.now.change(usec: 0) }
+    let_it_be(:issues) { create_list(:issue, 10, project: project, created_at: now) }
+
+    let(:count_path) { %w(data project issues count) }
+    let(:page_size) { 3 }
+    let(:query) do
+      <<~GRAPHQL
+        query project($fullPath: ID!, $first: Int, $after: String) {
+          project(fullPath: $fullPath) {
+            issues(first: $first, after: $after) {
+              count
+              edges {
+                node {
+                  iid
+                }
+              }
+              pageInfo {
+                endCursor
+                hasNextPage
+              }
+            }
+          }
+        }
+      GRAPHQL
+    end
+
+    subject do
+      GitlabSchema.execute(
+        query,
+        context: { current_user: user },
+        variables: {
+          fullPath: project.full_path,
+          first: page_size
+        }
+      ).to_h
+    end
+
+    context 'when user does not have the permission' do
+      it 'returns no data' do
+        allow(Ability).to receive(:allowed?).with(user, :read_project, project).and_return(false)
+
+        expect(subject.dig(:data, :project)).to eq(nil)
+      end
+    end
+
+    context 'count' do
+      let(:end_cursor) { %w(data project issues pageInfo endCursor) }
+      let(:issues_edges) { %w(data project issues edges) }
+
+      it 'returns total count' do
+        expect(subject.dig(*count_path)).to eq(issues.count)
+      end
+
+      it 'total count does not change between pages' do
+        old_count = subject.dig(*count_path)
+        new_cursor = subject.dig(*end_cursor)
+
+        new_page = GitlabSchema.execute(
+          query,
+          context: { current_user: user },
+          variables: {
+            fullPath: project.full_path,
+            first: page_size,
+            after: new_cursor
+          }
+        ).to_h
+
+        new_count = new_page.dig(*count_path)
+        expect(old_count).to eq(new_count)
+      end
+
+      context 'pagination' do
+        let(:page_size) { 9 }
+
+        it 'returns new ids during pagination' do
+          old_edges = subject.dig(*issues_edges)
+          new_cursor = subject.dig(*end_cursor)
+
+          new_edges = GitlabSchema.execute(
+            query,
+            context: { current_user: user },
+            variables: {
+              fullPath: project.full_path,
+              first: page_size,
+              after: new_cursor
+            }
+          ).to_h.dig(*issues_edges)
+
+          expect(old_edges.count).to eq(9)
+          expect(new_edges.count).to eq(1)
+        end
+      end
+    end
+  end
+
   describe "issue notes" do
     let(:user) { create(:user) }
     let(:project) { create(:project, :public) }
diff --git a/spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb b/spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb
index 73f38c17729..e42a448a01e 100644
--- a/spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb
+++ b/spec/migrations/20200511145545_change_variable_interpolation_format_in_common_metrics_spec.rb
@@ -23,9 +23,14 @@ RSpec.describe ChangeVariableInterpolationFormatInCommonMetrics, :migration do
   end
 
   it 'updates query to use {{}}' do
-    expected_query = 'avg(sum(container_memory_usage_bytes{container_name!="POD",' \
-    'pod_name=~"^{{ci_environment_slug}}-(.*)",namespace="{{kube_namespace}}"})' \
-    ' by (job)) without (job)  /1024/1024/1024'
+    expected_query = <<~EOS.chomp
+    avg(sum(container_memory_usage_bytes{container!="POD",\
+    pod=~"^{{ci_environment_slug}}-(.*)",namespace="{{kube_namespace}}"}) \
+    by (job)) without (job)  /1024/1024/1024     OR      \
+    avg(sum(container_memory_usage_bytes{container_name!="POD",\
+    pod_name=~"^{{ci_environment_slug}}-(.*)",namespace="{{kube_namespace}}"}) \
+    by (job)) without (job)  /1024/1024/1024
+    EOS
 
     migrate!