From 33882b0ed118afb7239b76a074f9ab7cf90558f3 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Thu, 8 Oct 2020 09:08:40 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../components/design_scaler.vue              |  2 +-
 .../design_management/components/image.vue    |  4 +-
 .../design_management/pages/design/index.vue  |  9 +++-
 .../design_management/utils/cache_update.js   |  2 +-
 .../javascripts/lib/utils/text_markdown.js    |  1 +
 .../notes/components/timeline_toggle.vue      |  5 ++
 app/assets/javascripts/notes/utils.js         | 12 +++++
 .../test_reports/test_suite_table.vue         | 30 ++++++++---
 .../sidebar/stores/sidebar_store.js           | 28 +++++-----
 .../components/states/squash_before_merge.vue | 31 ++++++-----
 .../vue_merge_request_widget/i18n.js          |  7 +++
 app/helpers/issuables_helper.rb               |  2 +-
 app/presenters/snippet_blob_presenter.rb      |  2 +
 app/views/dashboard/todos/_todo.html.haml     |  2 +-
 .../layouts/nav/sidebar/_project.html.haml    | 51 ++++++++++---------
 app/views/projects/empty.html.haml            |  2 +-
 .../merge_requests/_merge_request.html.haml   |  2 +-
 app/views/shared/issuable/_sidebar.html.haml  |  4 +-
 .../issuable/_sidebar_assignees.html.haml     |  1 -
 .../issuable/_sidebar_reviewers.html.haml     |  1 -
 ...19032-add-filename-to-unit-test-report.yml |  5 ++
 ...suggestion-button-not-work-for-numbers.yml |  5 ++
 .../unreleased/243776-reorder-nav-item.yml    |  5 ++
 .../255985-snowplow-count-timeline-toggle.yml |  5 ++
 ...-button-misaligned-on-empty-repository.yml |  5 ++
 changelogs/unreleased/fix-design-zoom.yml     |  5 ++
 ...use-bitnami-postgres-for-test-template.yml |  5 ++
 .../development/cached_markdown_blob.yml      |  2 +-
 .../project_finder_similarity_sort.yml        |  2 +-
 .../geo/disaster_recovery/index.md            |  4 +-
 .../geo/replication/geo_validation_tests.md   |  2 +-
 .../packages/container_registry.md            |  2 +-
 .../postgresql/replication_and_failover.md    |  7 ++-
 doc/administration/raketasks/check.md         |  2 +-
 doc/ci/unit_test_reports.md                   |  8 +--
 doc/ci/yaml/README.md                         |  2 +-
 .../contributing/issue_workflow.md            |  2 +-
 doc/development/fe_guide/graphql.md           |  2 +-
 doc/development/telemetry/usage_ping.md       |  6 +--
 .../testing_guide/best_practices.md           |  2 +-
 ...unning_tests_that_require_special_setup.md |  4 +-
 doc/gitlab-basics/add-file.md                 |  4 +-
 doc/install/installation.md                   |  2 +-
 doc/integration/elasticsearch.md              |  2 +-
 .../incident_management/alert_integrations.md |  2 +-
 doc/push_rules/push_rules.md                  |  6 +--
 doc/user/admin_area/credentials_inventory.md  |  8 +--
 .../application_security/api_fuzzing/index.md |  8 +--
 doc/user/application_security/sast/index.md   |  2 +-
 .../packages/composer_repository/index.md     |  6 +--
 doc/user/packages/conan_repository/index.md   | 16 +++---
 doc/user/packages/container_registry/index.md |  8 +--
 doc/user/packages/npm_registry/index.md       |  4 +-
 doc/user/project/code_owners.md               |  2 +-
 doc/user/project/deploy_boards.md             |  2 +-
 doc/user/project/issue_board.md               |  6 +--
 .../project/issues/issue_data_and_actions.md  |  2 +-
 .../test_coverage_visualization.md            |  4 +-
 doc/user/search/advanced_search_syntax.md     |  3 +-
 doc/user/search/index.md                      |  4 +-
 doc/user/todos.md                             |  8 ++-
 .../ci/templates/Jobs/Test.gitlab-ci.yml      |  5 +-
 lib/gitlab/quick_actions/issuable_actions.rb  | 12 ++---
 locale/gitlab.pot                             | 29 +++++++----
 spec/features/dashboard/todos/todos_spec.rb   |  4 +-
 spec/features/issues/todo_spec.rb             |  4 +-
 spec/features/projects/navbar_spec.rb         |  2 +-
 spec/frontend/collapsed_sidebar_todo_spec.js  |  6 +--
 .../cycle_analytics/stage_nav_item_spec.js    |  4 +-
 .../__snapshots__/design_scaler_spec.js.snap  |  6 +--
 .../__snapshots__/image_spec.js.snap          | 10 ++--
 .../design_management/pages/index_spec.js     |  4 +-
 spec/frontend/lib/utils/text_markdown_spec.js | 17 +++++++
 .../notes/components/timeline_toggle_spec.js  | 24 +++++++++
 .../pipelines/test_reports/mock_data.js       |  3 ++
 .../test_reports/test_suite_table_spec.js     | 11 ++++
 .../mr_widget_squash_before_merge_spec.js     |  5 +-
 .../presenters/snippet_blob_presenter_spec.rb | 50 +++++++++++++++++-
 .../quick_actions/interpret_service_spec.rb   |  4 +-
 .../navbar_structure_context.rb               | 10 ++--
 spec/tasks/gitlab/backup_rake_spec.rb         |  8 +--
 81 files changed, 403 insertions(+), 194 deletions(-)
 create mode 100644 app/assets/javascripts/notes/utils.js
 create mode 100644 app/assets/javascripts/vue_merge_request_widget/i18n.js
 create mode 100644 changelogs/unreleased/119032-add-filename-to-unit-test-report.yml
 create mode 100644 changelogs/unreleased/224143-suggestion-button-not-work-for-numbers.yml
 create mode 100644 changelogs/unreleased/243776-reorder-nav-item.yml
 create mode 100644 changelogs/unreleased/255985-snowplow-count-timeline-toggle.yml
 create mode 100644 changelogs/unreleased/263221-clone-button-misaligned-on-empty-repository.yml
 create mode 100644 changelogs/unreleased/fix-design-zoom.yml
 create mode 100644 changelogs/unreleased/use-bitnami-postgres-for-test-template.yml

diff --git a/app/assets/javascripts/design_management/components/design_scaler.vue b/app/assets/javascripts/design_management/components/design_scaler.vue
index 55dee74bef5c7..8d26f84641e3e 100644
--- a/app/assets/javascripts/design_management/components/design_scaler.vue
+++ b/app/assets/javascripts/design_management/components/design_scaler.vue
@@ -51,7 +51,7 @@ export default {
 <template>
   <div class="design-scaler btn-group" role="group">
     <button class="btn" :disabled="disableDecrease" @click="decrementScale">
-      <span class="d-flex-center gl-icon s16">
+      <span class="gl-display-flex gl-justify-content-center gl-align-items-center gl-icon s16">
         –
       </span>
     </button>
diff --git a/app/assets/javascripts/design_management/components/image.vue b/app/assets/javascripts/design_management/components/image.vue
index 91b7b576e0cab..53062e6ebb007 100644
--- a/app/assets/javascripts/design_management/components/image.vue
+++ b/app/assets/javascripts/design_management/components/image.vue
@@ -93,8 +93,8 @@ export default {
 </script>
 
 <template>
-  <div class="m-auto js-design-image">
-    <gl-icon v-if="imageError" class="text-secondary-100" name="media-broken" :size="48" />
+  <div class="gl-mx-auto gl-my-auto js-design-image">
+    <gl-icon v-if="imageError" class="gl-text-gray-200" name="media-broken" :size="48" />
     <img
       v-show="!imageError"
       ref="contentImg"
diff --git a/app/assets/javascripts/design_management/pages/design/index.vue b/app/assets/javascripts/design_management/pages/design/index.vue
index c6225c516e274..705bc6fa52801 100644
--- a/app/assets/javascripts/design_management/pages/design/index.vue
+++ b/app/assets/javascripts/design_management/pages/design/index.vue
@@ -40,6 +40,8 @@ import { trackDesignDetailView } from '../../utils/tracking';
 import { DESIGNS_ROUTE_NAME } from '../../router/constants';
 import { ACTIVE_DISCUSSION_SOURCE_TYPES } from '../../constants';
 
+const DEFAULT_SCALE = 1;
+
 export default {
   components: {
     ApolloMutation,
@@ -65,7 +67,7 @@ export default {
       comment: '',
       annotationCoordinates: null,
       errorMessage: '',
-      scale: 1,
+      scale: DEFAULT_SCALE,
       resolvedDiscussionsExpanded: false,
     };
   },
@@ -157,6 +159,11 @@ export default {
   beforeDestroy() {
     Mousetrap.unbind('esc', this.closeDesign);
   },
+  beforeRouteUpdate(to, from, next) {
+    // reset scale when the active design changes
+    this.scale = DEFAULT_SCALE;
+    next();
+  },
   methods: {
     addImageDiffNoteToStore(
       store,
diff --git a/app/assets/javascripts/design_management/utils/cache_update.js b/app/assets/javascripts/design_management/utils/cache_update.js
index cf6fba95115fd..fc0530ff977a6 100644
--- a/app/assets/javascripts/design_management/utils/cache_update.js
+++ b/app/assets/javascripts/design_management/utils/cache_update.js
@@ -136,7 +136,7 @@ const addNewDesignToStore = (store, designManagementUpload, query) => {
 
     const newDesigns = currentDesigns
       .map(design => {
-        return designManagementUpload.designs[design.filename] || design;
+        return designManagementUpload.designs.find(d => d.filename === design.filename) || design;
       })
       .concat(difference);
 
diff --git a/app/assets/javascripts/lib/utils/text_markdown.js b/app/assets/javascripts/lib/utils/text_markdown.js
index f4c6e4e35849a..3daffbd572fa1 100644
--- a/app/assets/javascripts/lib/utils/text_markdown.js
+++ b/app/assets/javascripts/lib/utils/text_markdown.js
@@ -166,6 +166,7 @@ export function insertMarkdownText({
   let editorSelectionEnd;
   let lastNewLine;
   let textToInsert;
+  selected = selected.toString();
 
   if (editor) {
     const selectionRange = getEditorSelectionRange(editor);
diff --git a/app/assets/javascripts/notes/components/timeline_toggle.vue b/app/assets/javascripts/notes/components/timeline_toggle.vue
index 735dc5ff2a81a..d1ffe0a3601e4 100644
--- a/app/assets/javascripts/notes/components/timeline_toggle.vue
+++ b/app/assets/javascripts/notes/components/timeline_toggle.vue
@@ -4,6 +4,8 @@ import { mapActions, mapGetters } from 'vuex';
 import { s__ } from '~/locale';
 import { COMMENTS_ONLY_FILTER_VALUE, DESC } from '../constants';
 import notesEventHub from '../event_hub';
+import TrackEventDirective from '~/vue_shared/directives/track_event';
+import { trackToggleTimelineView } from '../utils';
 
 export const timelineEnabledTooltip = s__('Timeline|Turn timeline view off');
 export const timelineDisabledTooltip = s__('Timeline|Turn timeline view on');
@@ -14,6 +16,7 @@ export default {
   },
   directives: {
     GlTooltip: GlTooltipDirective,
+    TrackEvent: TrackEventDirective,
   },
   computed: {
     ...mapGetters(['timelineEnabled', 'sortDirection']),
@@ -23,6 +26,7 @@ export default {
   },
   methods: {
     ...mapActions(['setTimelineView', 'setDiscussionSortDirection']),
+    trackToggleTimelineView,
     setSort() {
       if (this.timelineEnabled && this.sortDirection !== DESC) {
         this.setDiscussionSortDirection({ direction: DESC, persist: false });
@@ -44,6 +48,7 @@ export default {
 <template>
   <gl-button
     v-gl-tooltip
+    v-track-event="trackToggleTimelineView(timelineEnabled)"
     icon="comments"
     size="small"
     :selected="timelineEnabled"
diff --git a/app/assets/javascripts/notes/utils.js b/app/assets/javascripts/notes/utils.js
new file mode 100644
index 0000000000000..e6c2eb06a5129
--- /dev/null
+++ b/app/assets/javascripts/notes/utils.js
@@ -0,0 +1,12 @@
+/* eslint-disable @gitlab/require-i18n-strings */
+
+/**
+ * Tracks snowplow event when User toggles timeline view
+ * @param {Boolean} enabled that will be send as a property for the event
+ */
+export const trackToggleTimelineView = enabled => ({
+  category: 'Incident Management',
+  action: 'toggle_incident_comments_into_timeline_view',
+  label: 'Status',
+  property: enabled,
+});
diff --git a/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue b/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue
index aa53c5040e81e..2b92ffc3f26c4 100644
--- a/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue
+++ b/app/assets/javascripts/pipelines/components/test_reports/test_suite_table.vue
@@ -1,6 +1,6 @@
 <script>
 import { mapGetters } from 'vuex';
-import { GlTooltipDirective, GlFriendlyWrap, GlIcon } from '@gitlab/ui';
+import { GlTooltipDirective, GlFriendlyWrap, GlIcon, GlButton } from '@gitlab/ui';
 import { __ } from '~/locale';
 
 export default {
@@ -8,6 +8,7 @@ export default {
   components: {
     GlIcon,
     GlFriendlyWrap,
+    GlButton,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -45,6 +46,9 @@ export default {
         <div role="rowheader" class="table-section section-20">
           {{ __('Name') }}
         </div>
+        <div role="rowheader" class="table-section section-10">
+          {{ __('Filename') }}
+        </div>
         <div role="rowheader" class="table-section section-10 text-center">
           {{ __('Status') }}
         </div>
@@ -63,18 +67,30 @@ export default {
       >
         <div class="table-section section-20 section-wrap">
           <div role="rowheader" class="table-mobile-header">{{ __('Suite') }}</div>
-          <div class="table-mobile-content pr-md-1 gl-overflow-wrap-break">
+          <div class="table-mobile-content gl-md-pr-2 gl-overflow-wrap-break">
             <gl-friendly-wrap :symbols="$options.wrapSymbols" :text="testCase.classname" />
           </div>
         </div>
 
         <div class="table-section section-20 section-wrap">
           <div role="rowheader" class="table-mobile-header">{{ __('Name') }}</div>
-          <div class="table-mobile-content pr-md-1 gl-overflow-wrap-break">
-            <gl-friendly-wrap
-              data-testid="caseName"
-              :symbols="$options.wrapSymbols"
-              :text="testCase.name"
+          <div class="table-mobile-content gl-md-pr-2 gl-overflow-wrap-break">
+            <gl-friendly-wrap :symbols="$options.wrapSymbols" :text="testCase.name" />
+          </div>
+        </div>
+
+        <div class="table-section section-10 section-wrap">
+          <div role="rowheader" class="table-mobile-header">{{ __('Filename') }}</div>
+          <div class="table-mobile-content gl-md-pr-2 gl-overflow-wrap-break">
+            <gl-friendly-wrap :symbols="$options.wrapSymbols" :text="testCase.file" />
+            <gl-button
+              v-gl-tooltip
+              size="small"
+              category="tertiary"
+              icon="copy-to-clipboard"
+              :title="__('Copy to clipboard')"
+              :data-clipboard-text="testCase.file"
+              :aria-label="__('Copy to clipboard')"
             />
           </div>
         </div>
diff --git a/app/assets/javascripts/sidebar/stores/sidebar_store.js b/app/assets/javascripts/sidebar/stores/sidebar_store.js
index 8d0d093e920fc..97cc83b738139 100644
--- a/app/assets/javascripts/sidebar/stores/sidebar_store.js
+++ b/app/assets/javascripts/sidebar/stores/sidebar_store.js
@@ -37,17 +37,17 @@ export default class SidebarStore {
     SidebarStore.singleton = this;
   }
 
-  setAssigneeData(data) {
+  setAssigneeData({ assignees }) {
     this.isFetching.assignees = false;
-    if (data.assignees) {
-      this.assignees = data.assignees;
+    if (assignees) {
+      this.assignees = assignees;
     }
   }
 
-  setReviewerData(data) {
+  setReviewerData({ reviewers }) {
     this.isFetching.reviewers = false;
-    if (data.reviewers) {
-      this.reviewers = data.reviewers;
+    if (reviewers) {
+      this.reviewers = reviewers;
     }
   }
 
@@ -91,22 +91,22 @@ export default class SidebarStore {
   }
 
   findAssignee(findAssignee) {
-    return this.assignees.find(assignee => assignee.id === findAssignee.id);
+    return this.assignees.find(({ id }) => id === findAssignee.id);
   }
 
   findReviewer(findReviewer) {
-    return this.reviewers.find(reviewer => reviewer.id === findReviewer.id);
+    return this.reviewers.find(({ id }) => id === findReviewer.id);
   }
 
-  removeAssignee(removeAssignee) {
-    if (removeAssignee) {
-      this.assignees = this.assignees.filter(assignee => assignee.id !== removeAssignee.id);
+  removeAssignee(assignee) {
+    if (assignee) {
+      this.assignees = this.assignees.filter(({ id }) => id !== assignee.id);
     }
   }
 
-  removeReviewer(removeReviewer) {
-    if (removeReviewer) {
-      this.reviewers = this.reviewers.filter(reviewer => reviewer.id !== removeReviewer.id);
+  removeReviewer(reviewer) {
+    if (reviewer) {
+      this.reviewers = this.reviewers.filter(({ id }) => id !== reviewer.id);
     }
   }
 
diff --git a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
index 6608381f34893..ff0d065c71daa 100644
--- a/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
+++ b/app/assets/javascripts/vue_merge_request_widget/components/states/squash_before_merge.vue
@@ -1,14 +1,16 @@
 <script>
-import { GlIcon } from '@gitlab/ui';
-import tooltip from '~/vue_shared/directives/tooltip';
-import { __ } from '~/locale';
+import { GlIcon, GlTooltipDirective } from '@gitlab/ui';
+import { SQUASH_BEFORE_MERGE } from '../../i18n';
 
 export default {
   components: {
     GlIcon,
   },
   directives: {
-    tooltip,
+    GlTooltip: GlTooltipDirective,
+  },
+  i18n: {
+    ...SQUASH_BEFORE_MERGE,
   },
   props: {
     value: {
@@ -28,7 +30,10 @@ export default {
   },
   computed: {
     tooltipTitle() {
-      return this.isDisabled ? __('Required in this project.') : false;
+      return this.isDisabled ? this.$options.i18n.tooltipTitle : null;
+    },
+    tooltipFocusable() {
+      return this.isDisabled ? '0' : null;
     },
   },
 };
@@ -37,10 +42,11 @@ export default {
 <template>
   <div class="inline">
     <label
-      v-tooltip
+      v-gl-tooltip
       :class="{ 'gl-text-gray-400': isDisabled }"
+      :tabindex="tooltipFocusable"
       data-testid="squashLabel"
-      :data-title="tooltipTitle"
+      :title="tooltipTitle"
     >
       <input
         :checked="value"
@@ -50,19 +56,20 @@ export default {
         class="qa-squash-checkbox js-squash-checkbox"
         @change="$emit('input', $event.target.checked)"
       />
-      {{ __('Squash commits') }}
+      {{ $options.i18n.checkboxLabel }}
     </label>
     <a
       v-if="helpPath"
-      v-tooltip
+      v-gl-tooltip
       :href="helpPath"
-      data-title="About this feature"
-      data-placement="bottom"
+      :title="$options.i18n.helpLabel"
       target="_blank"
       rel="noopener noreferrer nofollow"
-      data-container="body"
     >
       <gl-icon name="question" />
+      <span class="sr-only">
+        {{ $options.i18n.helpLabel }}
+      </span>
     </a>
   </div>
 </template>
diff --git a/app/assets/javascripts/vue_merge_request_widget/i18n.js b/app/assets/javascripts/vue_merge_request_widget/i18n.js
new file mode 100644
index 0000000000000..e8e522a01e9ed
--- /dev/null
+++ b/app/assets/javascripts/vue_merge_request_widget/i18n.js
@@ -0,0 +1,7 @@
+import { __ } from '~/locale';
+
+export const SQUASH_BEFORE_MERGE = {
+  tooltipTitle: __('Required in this project.'),
+  checkboxLabel: __('Squash commits'),
+  helpLabel: __('What is squashing?'),
+};
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index 5b5902b1fa256..87e38a94cbe0b 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -435,7 +435,7 @@ def selected_template(issuable)
 
   def issuable_todo_button_data(issuable, is_collapsed)
     {
-      todo_text: _('Add a To Do'),
+      todo_text: _('Add a to do'),
       mark_text: _('Mark as done'),
       todo_icon: sprite_icon('todo-add'),
       mark_icon: sprite_icon('todo-done', css_class: 'todo-undone'),
diff --git a/app/presenters/snippet_blob_presenter.rb b/app/presenters/snippet_blob_presenter.rb
index 665b365762337..597ef6ebc39f7 100644
--- a/app/presenters/snippet_blob_presenter.rb
+++ b/app/presenters/snippet_blob_presenter.rb
@@ -48,6 +48,8 @@ def renderer
   end
 
   def snippet_blob_raw_route(only_path: false)
+    return gitlab_raw_snippet_url(snippet, only_path: only_path) unless snippet.repository_exists?
+
     gitlab_raw_snippet_blob_url(snippet, blob.path, only_path: only_path)
   end
 end
diff --git a/app/views/dashboard/todos/_todo.html.haml b/app/views/dashboard/todos/_todo.html.haml
index 96714ebf92229..0cf5ef93e96d0 100644
--- a/app/views/dashboard/todos/_todo.html.haml
+++ b/app/views/dashboard/todos/_todo.html.haml
@@ -57,5 +57,5 @@
   - else
     .todo-actions
       = link_to restore_dashboard_todo_path(todo), method: :patch, class: 'btn btn-loading d-flex align-items-center js-add-todo', data: { href: restore_dashboard_todo_path(todo) } do
-        Add a To Do
+        Add a to do
         %span.spinner.ml-1
diff --git a/app/views/layouts/nav/sidebar/_project.html.haml b/app/views/layouts/nav/sidebar/_project.html.haml
index c11afc8e4ca2c..18d62e275a051 100644
--- a/app/views/layouts/nav/sidebar/_project.html.haml
+++ b/app/views/layouts/nav/sidebar/_project.html.haml
@@ -229,37 +229,32 @@
                   %span
                     = _('Metrics')
 
-            - if project_nav_tab?(:alert_management)
-              = nav_link(controller: :alert_management) do
-                = link_to project_alert_management_index_path(@project), title: _('Alerts') do
-                  %span
-                    = _('Alerts')
-
-            - if project_nav_tab?(:incidents)
-              = nav_link(controller: :incidents) do
-                = link_to project_incidents_path(@project), title: _('Incidents'), data: { qa_selector: 'operations_incidents_link' } do
+            - if project_nav_tab?(:environments) && can?(current_user, :read_pod_logs, @project)
+              = nav_link(controller: :logs, action: [:index]) do
+                = link_to project_logs_path(@project), title: _('Logs') do
                   %span
-                    = _('Incidents')
+                    = _('Logs')
 
             - if project_nav_tab? :environments
               = render_if_exists "layouts/nav/sidebar/tracing_link"
 
-              = nav_link(controller: :environments, action: [:index, :folder, :show, :new, :edit, :create, :update, :stop, :terminal]) do
-                = link_to project_environments_path(@project), title: _('Environments'), class: 'shortcuts-environments qa-operations-environments-link' do
-                  %span
-                    = _('Environments')
-
             - if project_nav_tab?(:error_tracking)
               = nav_link(controller: :error_tracking) do
                 = link_to project_error_tracking_index_path(@project), title: _('Error Tracking') do
                   %span
                     = _('Error Tracking')
 
-            - if project_nav_tab?(:product_analytics)
-              = nav_link(controller: :product_analytics) do
-                = link_to project_product_analytics_path(@project), title: _('Product Analytics') do
+            - if project_nav_tab?(:alert_management)
+              = nav_link(controller: :alert_management) do
+                = link_to project_alert_management_index_path(@project), title: _('Alerts') do
                   %span
-                    = _('Product Analytics')
+                    = _('Alerts')
+
+            - if project_nav_tab?(:incidents)
+              = nav_link(controller: :incidents) do
+                = link_to project_incidents_path(@project), title: _('Incidents'), data: { qa_selector: 'operations_incidents_link' } do
+                  %span
+                    = _('Incidents')
 
             - if project_nav_tab? :serverless
               = nav_link(controller: :functions) do
@@ -267,12 +262,6 @@
                   %span
                     = _('Serverless')
 
-            - if project_nav_tab?(:environments) && can?(current_user, :read_pod_logs, @project)
-              = nav_link(controller: :logs, action: [:index]) do
-                = link_to project_logs_path(@project), title: _('Logs') do
-                  %span
-                    = _('Logs')
-
             - if project_nav_tab? :clusters
               - show_cluster_hint = show_gke_cluster_integration_callout?(@project)
               = nav_link(controller: [:clusters, :user, :gcp]) do
@@ -302,8 +291,20 @@
                         %span= _("Got it!")
                         = sprite_icon('thumb-up')
 
+            - if project_nav_tab? :environments
+              = nav_link(controller: :environments, action: [:index, :folder, :show, :new, :edit, :create, :update, :stop, :terminal]) do
+                = link_to project_environments_path(@project), title: _('Environments'), class: 'shortcuts-environments qa-operations-environments-link' do
+                  %span
+                    = _('Environments')
+
             = render_if_exists 'layouts/nav/sidebar/project_feature_flags_link'
 
+            - if project_nav_tab?(:product_analytics)
+              = nav_link(controller: :product_analytics) do
+                = link_to project_product_analytics_path(@project), title: _('Product Analytics') do
+                  %span
+                    = _('Product Analytics')
+
       = render_if_exists 'layouts/nav/sidebar/project_packages_link'
 
       = render 'layouts/nav/sidebar/analytics_links', links: project_analytics_navbar_links(@project, current_user)
diff --git a/app/views/projects/empty.html.haml b/app/views/projects/empty.html.haml
index 3f19d4db1ccb6..a0341209dd54c 100644
--- a/app/views/projects/empty.html.haml
+++ b/app/views/projects/empty.html.haml
@@ -18,7 +18,7 @@
   .project-clone-holder.d-block.d-md-none.mt-2.mr-2
     = render "shared/mobile_clone_panel"
 
-  .project-clone-holder.d-none.d-md-inline-block.mt-2.mr-2.float-left
+  .project-clone-holder.d-none.d-md-inline-block.mb-2.mr-2.float-left
     = render "projects/buttons/clone"
   = render 'stat_anchor_list', anchors: @project.empty_repo_statistics_buttons, project_buttons: true
 
diff --git a/app/views/projects/merge_requests/_merge_request.html.haml b/app/views/projects/merge_requests/_merge_request.html.haml
index d55850b5673ed..8f8438d3eafa3 100644
--- a/app/views/projects/merge_requests/_merge_request.html.haml
+++ b/app/views/projects/merge_requests/_merge_request.html.haml
@@ -53,7 +53,7 @@
             = link_to merge_request_path(merge_request), class: "has-tooltip", title: _('Cannot be merged automatically') do
               = sprite_icon('warning-solid')
         - if merge_request.assignees.any?
-          %li.d-flex
+          %li.gl-display-flex
             = render 'shared/issuable/assignees', project: merge_request.project, issuable: merge_request
         - if Feature.enabled?(:merge_request_reviewers, @project) && merge_request.reviewers.any?
           %li.gl-display-flex.issuable-reviewers
diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml
index d0609109c490f..1e53efcaa3490 100644
--- a/app/views/shared/issuable/_sidebar.html.haml
+++ b/app/views/shared/issuable/_sidebar.html.haml
@@ -27,11 +27,11 @@
           .block.todo.hide-expanded
             = render "shared/issuable/sidebar_todo", issuable_sidebar: issuable_sidebar, is_collapsed: true
         .block.assignee.qa-assignee-block
-          = render "shared/issuable/sidebar_assignees", issuable_sidebar: issuable_sidebar, assignees: assignees
+          = render "shared/issuable/sidebar_assignees", issuable_sidebar: issuable_sidebar, assignees: assignees, signed_in: signed_in
 
         - if Feature.enabled?(:merge_request_reviewers, @project) && reviewers
           .block.reviewer.qa-reviewer-block
-            = render "shared/issuable/sidebar_reviewers", issuable_sidebar: issuable_sidebar, reviewers: reviewers
+            = render "shared/issuable/sidebar_reviewers", issuable_sidebar: issuable_sidebar, reviewers: reviewers, signed_in: signed_in
 
         = render_if_exists 'shared/issuable/sidebar_item_epic', issuable_sidebar: issuable_sidebar
 
diff --git a/app/views/shared/issuable/_sidebar_assignees.html.haml b/app/views/shared/issuable/_sidebar_assignees.html.haml
index 175713751efd2..ba6ff3a884bff 100644
--- a/app/views/shared/issuable/_sidebar_assignees.html.haml
+++ b/app/views/shared/issuable/_sidebar_assignees.html.haml
@@ -1,5 +1,4 @@
 - issuable_type = issuable_sidebar[:type]
-- signed_in = !!issuable_sidebar.dig(:current_user, :id)
 
 #js-vue-sidebar-assignees{ data: { field: issuable_type, signed_in: signed_in } }
   .title.hide-collapsed
diff --git a/app/views/shared/issuable/_sidebar_reviewers.html.haml b/app/views/shared/issuable/_sidebar_reviewers.html.haml
index 8b546d5e3445e..0142c87aeb0cd 100644
--- a/app/views/shared/issuable/_sidebar_reviewers.html.haml
+++ b/app/views/shared/issuable/_sidebar_reviewers.html.haml
@@ -1,5 +1,4 @@
 - issuable_type = issuable_sidebar[:type]
-- signed_in = !!issuable_sidebar.dig(:current_user, :id)
 
 #js-vue-sidebar-reviewers{ data: { field: issuable_type, signed_in: signed_in } }
   .title.hide-collapsed
diff --git a/changelogs/unreleased/119032-add-filename-to-unit-test-report.yml b/changelogs/unreleased/119032-add-filename-to-unit-test-report.yml
new file mode 100644
index 0000000000000..51b8b3b928746
--- /dev/null
+++ b/changelogs/unreleased/119032-add-filename-to-unit-test-report.yml
@@ -0,0 +1,5 @@
+---
+title: Add file name column to CI unit test report
+merge_request: 43338
+author:
+type: added
diff --git a/changelogs/unreleased/224143-suggestion-button-not-work-for-numbers.yml b/changelogs/unreleased/224143-suggestion-button-not-work-for-numbers.yml
new file mode 100644
index 0000000000000..3a7e88b2ef1c9
--- /dev/null
+++ b/changelogs/unreleased/224143-suggestion-button-not-work-for-numbers.yml
@@ -0,0 +1,5 @@
+---
+title: Ensure suggestion works for number text
+merge_request: 44332
+author:
+type: fixed
diff --git a/changelogs/unreleased/243776-reorder-nav-item.yml b/changelogs/unreleased/243776-reorder-nav-item.yml
new file mode 100644
index 0000000000000..ca08daa800bf5
--- /dev/null
+++ b/changelogs/unreleased/243776-reorder-nav-item.yml
@@ -0,0 +1,5 @@
+---
+title: Update sidebar operations order
+merge_request: 42493
+author:
+type: changed
diff --git a/changelogs/unreleased/255985-snowplow-count-timeline-toggle.yml b/changelogs/unreleased/255985-snowplow-count-timeline-toggle.yml
new file mode 100644
index 0000000000000..ea33491efcdaf
--- /dev/null
+++ b/changelogs/unreleased/255985-snowplow-count-timeline-toggle.yml
@@ -0,0 +1,5 @@
+---
+title: Snowplow count of clicks on timeline toggle for incident comments
+merge_request: 44487
+author:
+type: added
diff --git a/changelogs/unreleased/263221-clone-button-misaligned-on-empty-repository.yml b/changelogs/unreleased/263221-clone-button-misaligned-on-empty-repository.yml
new file mode 100644
index 0000000000000..cbf2820be6116
--- /dev/null
+++ b/changelogs/unreleased/263221-clone-button-misaligned-on-empty-repository.yml
@@ -0,0 +1,5 @@
+---
+title: Fix alignment issue of clone button
+merge_request: 44584
+author:
+type: fixed
diff --git a/changelogs/unreleased/fix-design-zoom.yml b/changelogs/unreleased/fix-design-zoom.yml
new file mode 100644
index 0000000000000..e73ec45491c4d
--- /dev/null
+++ b/changelogs/unreleased/fix-design-zoom.yml
@@ -0,0 +1,5 @@
+---
+title: Fix design scale bug when navigating to a design after zooming
+merge_request: 44262
+author:
+type: fixed
diff --git a/changelogs/unreleased/use-bitnami-postgres-for-test-template.yml b/changelogs/unreleased/use-bitnami-postgres-for-test-template.yml
new file mode 100644
index 0000000000000..a3ca1915fa024
--- /dev/null
+++ b/changelogs/unreleased/use-bitnami-postgres-for-test-template.yml
@@ -0,0 +1,5 @@
+---
+title: 'Switch Auto Test CI template to `bitnami/postgresql` docker image (was previously `postgres`)'
+merge_request: 44329
+author:
+type: changed
diff --git a/config/feature_flags/development/cached_markdown_blob.yml b/config/feature_flags/development/cached_markdown_blob.yml
index f125f598698d8..a7f42c945953b 100644
--- a/config/feature_flags/development/cached_markdown_blob.yml
+++ b/config/feature_flags/development/cached_markdown_blob.yml
@@ -1,7 +1,7 @@
 ---
 name: cached_markdown_blob
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/44300
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263406
 type: development
 group: group::source code
 default_enabled: false
diff --git a/config/feature_flags/development/project_finder_similarity_sort.yml b/config/feature_flags/development/project_finder_similarity_sort.yml
index 967a7766f445e..c0460d44b6c1c 100644
--- a/config/feature_flags/development/project_finder_similarity_sort.yml
+++ b/config/feature_flags/development/project_finder_similarity_sort.yml
@@ -1,7 +1,7 @@
 ---
 name: project_finder_similarity_sort
 introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/43136
-rollout_issue_url:
+rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/263249
 type: development
 group: group::threat_insights
 default_enabled: false
diff --git a/doc/administration/geo/disaster_recovery/index.md b/doc/administration/geo/disaster_recovery/index.md
index c2a59ade7e459..af4b3d0237a63 100644
--- a/doc/administration/geo/disaster_recovery/index.md
+++ b/doc/administration/geo/disaster_recovery/index.md
@@ -15,7 +15,7 @@ See [Geo limitations](../index.md#limitations) for more information.
 
 CAUTION: **Warning:**
 Disaster recovery for multi-secondary configurations is in **Alpha**.
-For the latest updates, check the [Disaster Recovery epic for complete maturity](https://gitlab.com/groups/gitlab-org/-/epics/590). 
+For the latest updates, check the [Disaster Recovery epic for complete maturity](https://gitlab.com/groups/gitlab-org/-/epics/590).
 Multi-secondary configurations require the complete re-synchronization and re-configuration of all non-promoted secondaries and
 will cause downtime.
 
@@ -132,7 +132,7 @@ Note the following when promoting a secondary:
 
 DANGER: **Danger:**
 In GitLab 13.2 and later versions, promoting a secondary node to a primary while the secondary is paused fails. We are [investigating the issue](https://gitlab.com/gitlab-org/gitlab/-/issues/225173). Do not pause replication before promoting a secondary. If the node is paused, please resume before promoting.
-   
+
    To promote the secondary node to primary along with preflight checks:
 
    ```shell
diff --git a/doc/administration/geo/replication/geo_validation_tests.md b/doc/administration/geo/replication/geo_validation_tests.md
index efd070635cb86..9295bc9d84c37 100644
--- a/doc/administration/geo/replication/geo_validation_tests.md
+++ b/doc/administration/geo/replication/geo_validation_tests.md
@@ -128,7 +128,7 @@ The following are PostgreSQL upgrade validation tests we performed.
   PostgreSQL 12 with a database cluster on the primary is not recommended until the issues are resolved.
 - Known issues for PostgreSQL clusters:
   - [Ensure Patroni detects PostgreSQL update](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5423)
-  - [Allow configuring permanent replication slots in patroni](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5628) 
+  - [Allow configuring permanent replication slots in patroni](https://gitlab.com/gitlab-org/omnibus-gitlab/-/issues/5628)
 
 ### August 2020
 
diff --git a/doc/administration/packages/container_registry.md b/doc/administration/packages/container_registry.md
index 29bf83ce2e00c..3785ff0e44e63 100644
--- a/doc/administration/packages/container_registry.md
+++ b/doc/administration/packages/container_registry.md
@@ -397,7 +397,7 @@ To configure the `s3` storage driver in Omnibus:
      }
    }
    ```
- 
+
    - `regionendpoint` is only required when configuring an S3 compatible service such as MinIO. It takes a URL such as `http://127.0.0.1:9000`.
    - `your-s3-bucket` should be the name of a bucket that exists, and can't include subdirectories.
 
diff --git a/doc/administration/postgresql/replication_and_failover.md b/doc/administration/postgresql/replication_and_failover.md
index 6b84b7ac7251f..a2f9d9778f170 100644
--- a/doc/administration/postgresql/replication_and_failover.md
+++ b/doc/administration/postgresql/replication_and_failover.md
@@ -1269,6 +1269,11 @@ with:
 sudo gitlab-ctl stop patroni
 ```
 
+Note that stopping or restarting Patroni service on the leader node will trigger the automatic failover. If you
+want to signal Patroni to reload its configuration or restart PostgreSQL process without triggering the failover, you
+must use the `reload` or `restart` sub-commands of `gitlab-ctl patroni` instead. These two sub-commands are wrappers of
+the same `patronictl` commands.
+
 ### Manual failover procedure for Patroni
 
 While Patroni supports automatic failover, you also have the ability to perform
@@ -1423,7 +1428,7 @@ Considering these, you should carefully plan your PostgreSQL upgrade:
    ```shell
    gitlab-ctl patroni check-leader
 
-   # OR 
+   # OR
 
    gitlab-ctl patroni members
    ```
diff --git a/doc/administration/raketasks/check.md b/doc/administration/raketasks/check.md
index f4c8bc9e98909..7e1943f29e0f1 100644
--- a/doc/administration/raketasks/check.md
+++ b/doc/administration/raketasks/check.md
@@ -158,7 +158,7 @@ Projects::HousekeepingService.new(p, :gc).execute
 ### Delete references to missing remote uploads
 
 `gitlab-rake gitlab:uploads:check VERBOSE=1` detects remote objects that do not exist because they were
-deleted externally but their references still exist in the GitLab database. 
+deleted externally but their references still exist in the GitLab database.
 
 Example output with error message:  
 
diff --git a/doc/ci/unit_test_reports.md b/doc/ci/unit_test_reports.md
index 79da54ccffe72..3b36d83d69467 100644
--- a/doc/ci/unit_test_reports.md
+++ b/doc/ci/unit_test_reports.md
@@ -18,12 +18,12 @@ tests failed so that they can fix them.
 
 You can configure your job to use Unit test reports, and GitLab will display a
 report on the merge request so that it's easier and faster to identify the
-failure without having to check the entire log. Unit test reports currently 
+failure without having to check the entire log. Unit test reports currently
 only support test reports in the JUnit report format.
 
-If you don't use Merge Requests but still want to see the unit test report 
-output without searching through job logs, the full 
-[Unit test reports](#viewing-unit-test-reports-on-gitlab) are available 
+If you don't use Merge Requests but still want to see the unit test report
+output without searching through job logs, the full
+[Unit test reports](#viewing-unit-test-reports-on-gitlab) are available
 in the pipeline detail view.
 
 Consider the following workflow:
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index 134c4d7aac783..a1a4c91e74c53 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -740,7 +740,7 @@ using [`|` (literal) and `>` (folded) YAML multi-line block scalar indicators](h
 
 CAUTION: **Warning:**
 If multiple commands are combined into one command string, only the last command's
-failure or success is reported. 
+failure or success is reported.
 [Failures from earlier commands are ignored due to a bug](https://gitlab.com/gitlab-org/gitlab-runner/-/issues/25394).
 To work around this,
 run each command as a separate `script:` item, or add an `exit 1` command
diff --git a/doc/development/contributing/issue_workflow.md b/doc/development/contributing/issue_workflow.md
index 42c67b97a3576..d9a53f3b20e61 100644
--- a/doc/development/contributing/issue_workflow.md
+++ b/doc/development/contributing/issue_workflow.md
@@ -323,7 +323,7 @@ More experienced contributors are very welcome to tackle
 For more complex features that have a weight of 2 or more and clear scope, we recommend looking at issues
 with the [label `~"Community Challenge"`](https://gitlab.com/gitlab-org/gitlab/-/issues?scope=all&utf8=%E2%9C%93&state=opened&label_name[]=Accepting%20merge%20requests&label_name[]=Community%20challenge).
 If your MR for the `~"Community Challenge"` issue gets merged, you will also have a chance to win a custom
-GitLab merchandise. 
+GitLab merchandise.
 
 If you've decided that you would like to work on an issue, please @-mention
 the [appropriate product manager](https://about.gitlab.com/handbook/product/#who-to-talk-to-for-what)
diff --git a/doc/development/fe_guide/graphql.md b/doc/development/fe_guide/graphql.md
index 82cd19dce4f36..5fae56e48ec1b 100644
--- a/doc/development/fe_guide/graphql.md
+++ b/doc/development/fe_guide/graphql.md
@@ -187,7 +187,7 @@ As shown in the code example by using `produce`, we can perform any kind of dire
 `draftState`. Besides, `immer` guarantees that a new state which includes the changes to `draftState` will be generated.
 
 Finally, to verify whether the immutable cache update is working properly, we need to change
-`assumeImmutableResults` to `true` in the `default client config` (see [Apollo Client](#apollo-client) for more info). 
+`assumeImmutableResults` to `true` in the `default client config` (see [Apollo Client](#apollo-client) for more info).
 
 If everything is working properly `assumeImmutableResults` should remain set to `true`.
 
diff --git a/doc/development/telemetry/usage_ping.md b/doc/development/telemetry/usage_ping.md
index ec60c92e2cd40..87dc32525eea3 100644
--- a/doc/development/telemetry/usage_ping.md
+++ b/doc/development/telemetry/usage_ping.md
@@ -226,7 +226,7 @@ sum(JiraImportState.finished, :imported_issues_count)
 ### Grouping & Batch Operations
 
 The `count`, `distinct_count`, and `sum` batch counters can accept an `ActiveRecord::Relation`
-object, which groups by a specified column. With a grouped relation, the methods do batch counting, 
+object, which groups by a specified column. With a grouped relation, the methods do batch counting,
 handle errors, and returns a hash table of key-value pairs.
 
 Examples:
@@ -369,7 +369,7 @@ Implemented using Redis methods [PFADD](https://redis.io/commands/pfadd) and [PF
    end
    ```
 
-1. Track event using `track_usage_event(event_name, values) in services and graphql
+1. Track event using `track_usage_event(event_name, values)` in services and graphql
 
    Increment unique values count using Redis HLL, for given event name.
 
@@ -912,7 +912,7 @@ The following is example content of the Usage Ping payload.
 
 ## Exporting Usage Ping SQL queries and definitions
 
-Two Rake tasks exist to export Usage Ping definitions. 
+Two Rake tasks exist to export Usage Ping definitions.
 
 - The Rake tasks export the raw SQL queries for `count`, `distinct_count`, `sum`.
 - The Rake tasks export the Redis counter class or the line of the Redis block for `redis_usage_data`.
diff --git a/doc/development/testing_guide/best_practices.md b/doc/development/testing_guide/best_practices.md
index 78b1b6ce0d043..01731ce27bf01 100644
--- a/doc/development/testing_guide/best_practices.md
+++ b/doc/development/testing_guide/best_practices.md
@@ -81,7 +81,7 @@ browser is much slower than parsing the HTML response from the app.
 
 A common cause of slow tests is excessive creation of objects, and thus
 computation and DB time. Factories are essential to development, but they can
-make inserting data into the DB so easy that we may be able to optimize. 
+make inserting data into the DB so easy that we may be able to optimize.
 
 The two basic techniques to bear in mind here are:
 
diff --git a/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md b/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md
index 7ac0a00fcffd7..658839fcf963c 100644
--- a/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md
+++ b/doc/development/testing_guide/end_to_end/running_tests_that_require_special_setup.md
@@ -274,7 +274,7 @@ CHROME_HEADLESS=false bundle exec bin/qa QA::EE::Scenario::Test::Geo --primary-a
 
 ### Using Geo in Docker
 
-You can use [GitLab-QA Orchestrator](https://gitlab.com/gitlab-org/gitlab-qa) to orchestrate two GitLab containers and configure them as a Geo setup. 
+You can use [GitLab-QA Orchestrator](https://gitlab.com/gitlab-org/gitlab-qa) to orchestrate two GitLab containers and configure them as a Geo setup.
 
 Geo requires an EE license. To visit the Geo sites in your browser, you will need a reverse proxy server (for example, [NGINX](https://www.nginx.com/)).
 
@@ -319,7 +319,7 @@ Geo requires an EE license. To visit the Geo sites in your browser, you will nee
    _Map the hostnames to the local IP in `/etc/hosts` file on your machine:_
 
    ```plaintext
-   127.0.0.1 gitlab-primary.geo gitlab-secondary.geo 
+   127.0.0.1 gitlab-primary.geo gitlab-secondary.geo
    ```
 
    _Note the assigned ports:_
diff --git a/doc/gitlab-basics/add-file.md b/doc/gitlab-basics/add-file.md
index e1ac1744b4a0f..0b400d7fdb461 100644
--- a/doc/gitlab-basics/add-file.md
+++ b/doc/gitlab-basics/add-file.md
@@ -31,7 +31,7 @@ cd <destination folder>
 
 [Create a new branch](create-branch.md) to add your file into. Submitting changes directly
 to the default branch should be avoided unless your project is very small and you're the
-only person working on it. 
+only person working on it.
 
 You can also [switch to an existing branch](start-using-git.md#work-on-an-existing-branch)
 if you have one already.
@@ -80,7 +80,7 @@ Now you can push (send) your changes (in the branch `<branch-name>`) to GitLab
 git push origin <branch-name>
 ```
 
-Your image is added to your branch in your repository in GitLab. 
+Your image is added to your branch in your repository in GitLab.
 
 <!-- ## Troubleshooting
 
diff --git a/doc/install/installation.md b/doc/install/installation.md
index bfdf797cc7705..7c202c0cdff72 100644
--- a/doc/install/installation.md
+++ b/doc/install/installation.md
@@ -321,7 +321,7 @@ Starting from GitLab 12.1, only PostgreSQL is supported. Since GitLab 13.0, we [
    ```shell
    sudo apt-get install -y postgresql postgresql-client libpq-dev postgresql-contrib
    ```
-   
+
 1. Verify the PostgreSQL version you have is supported by the version of GitLab you're
    installing:
 
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index c8c98fa6a663f..7d6b383174b5f 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -178,7 +178,7 @@ To enable Advanced Search, you need to have admin access to GitLab:
    [license](../user/admin_area/license.md).
 
 1. Configure the [Advanced Search settings](#advanced-search-configuration) for
-   your Elasticsearch cluster. Do not enable **Search with Elasticsearch enabled** 
+   your Elasticsearch cluster. Do not enable **Search with Elasticsearch enabled**
    yet.
 1. Now enable **Elasticsearch indexing** in **Admin Area > Settings >
    General > Advanced Search** and click **Save changes**. This will create
diff --git a/doc/operations/incident_management/alert_integrations.md b/doc/operations/incident_management/alert_integrations.md
index ab7ade93ff706..febc1d7eda9bb 100644
--- a/doc/operations/incident_management/alert_integrations.md
+++ b/doc/operations/incident_management/alert_integrations.md
@@ -31,7 +31,7 @@ You will need to activate the endpoint and obtain credentials to set up this int
 
 ### External Prometheus integration
 
-For GitLab versions 13.1 and greater, please see [External Prometheus Instances](../metrics/alerts.md#external-prometheus-instances) to configure alerts for this integration. 
+For GitLab versions 13.1 and greater, please see [External Prometheus Instances](../metrics/alerts.md#external-prometheus-instances) to configure alerts for this integration.
 
 ## Customizing the payload
 
diff --git a/doc/push_rules/push_rules.md b/doc/push_rules/push_rules.md
index 032ec1cb8ca58..d2ec157788aae 100644
--- a/doc/push_rules/push_rules.md
+++ b/doc/push_rules/push_rules.md
@@ -184,12 +184,12 @@ bash_history
 
 Each file name contained in a Git push is compared to the regular expression in this field. Filenames in Git consist of both the file's name and any directory that may precede it. A singular regular expression can contain multiple independent matches used as exclusions. File names can be broadly matched to any location in the repository, or restricted to specific locations. Filenames can also be partial matches used to exclude file types by extension.
 
-The following examples make use of regex string boundary characters which match the beginning of a string (`^`), and the end (`$`). They also include instances where either the directory path or the filename can include `.` or `/`. Both of these special regex characters have to be escaped with a backslash `\` to be used as normal characters in a match condition.
+The following examples make use of regex string boundary characters which match the beginning of a string (`^`), and the end (`$`). They also include instances where either the directory path or the filename can include `.` or `/`. Both of these special regex characters have to be escaped with a backslash `\\` to be used as normal characters in a match condition.
 
 Example: prevent pushing any `.exe` files to any location in the repository. This is an example of a partial match, which can match any filename that contains `.exe` at the end:
 
 ```plaintext
-\.exe$ 
+\.exe$
 ```
 
 Example: prevent a specific configuration file in the repository root from being pushed:
@@ -214,7 +214,7 @@ Example: combining all of the above in a single expression. Note that all of the
 
 ```plaintext
 (\.exe|^config\.yml|^directory-name\/config\.yml|(^|\/)install\.exe)$
-``` 
+```
 
 <!-- ## Troubleshooting
 
diff --git a/doc/user/admin_area/credentials_inventory.md b/doc/user/admin_area/credentials_inventory.md
index e845f22140b5e..e66d5b81d0dcc 100644
--- a/doc/user/admin_area/credentials_inventory.md
+++ b/doc/user/admin_area/credentials_inventory.md
@@ -35,7 +35,7 @@ If you see a **Revoke** button, you can revoke that user's PAT. Whether you see
 |-------------|------------------------|--------------------|----------------------------------------------------------------------------|
 | Active      | Yes                    | Yes                | Allows administrators to revoke the PAT, such as for a compromised account |
 | Active      | No                     | Yes                | Allows administrators to revoke the PAT, such as for a compromised account |
-| Expired     | Yes                    | No                 | PAT expires automatically                                                  |                                      
-| Expired     | No                     | Yes                | The administrator may revoke the PAT to prevent indefinite use             | 
-| Revoked     | Yes                    | No                 | Not applicable; token is already revoked                                   | 
-| Revoked     | No                     | No                 | Not applicable; token is already revoked                                   |                                                               
+| Expired     | Yes                    | No                 | PAT expires automatically                                                  |
+| Expired     | No                     | Yes                | The administrator may revoke the PAT to prevent indefinite use             |
+| Revoked     | Yes                    | No                 | Not applicable; token is already revoked                                   |
+| Revoked     | No                     | No                 | Not applicable; token is already revoked                                   |
diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md
index ae22655e30bb8..145422f8736ff 100644
--- a/doc/user/application_security/api_fuzzing/index.md
+++ b/doc/user/application_security/api_fuzzing/index.md
@@ -8,8 +8,8 @@ type: reference, howto
 # Web API Fuzz Testing **(ULTIMATE)**
 
 You can add web API fuzzing to your [GitLab CI/CD](../../../ci/README.md)
-pipelines. This helps you discover bugs and potential security issues that other QA processes may miss. 
-API fuzzing performs fuzz testing of API operation parameters. 
+pipelines. This helps you discover bugs and potential security issues that other QA processes may miss.
+API fuzzing performs fuzz testing of API operation parameters.
 Fuzz testing sets operation parameters to unexpected values in an effort to cause unexpected behavior and errors in the API backend.
 
 We recommend that you use fuzz testing in addition to [GitLab Secure](../index.md)'s
@@ -443,7 +443,7 @@ Example usage for setting a single header:
 ```json
 {
   "headers": {
-    "Authorization": "Bearer dXNlcm5hbWU6cGFzc3dvcmQ=" 
+    "Authorization": "Bearer dXNlcm5hbWU6cGFzc3dvcmQ="
   }
 }
 ```
@@ -453,7 +453,7 @@ Example usage for setting both a header and cookie:
 ```json
 {
   "headers": {
-    "Authorization": "Bearer dXNlcm5hbWU6cGFzc3dvcmQ=" 
+    "Authorization": "Bearer dXNlcm5hbWU6cGFzc3dvcmQ="
   },
   "cookies": {
     "flags": "677"
diff --git a/doc/user/application_security/sast/index.md b/doc/user/application_security/sast/index.md
index 7d7bbb74a55a1..3b1c1b05e6682 100644
--- a/doc/user/application_security/sast/index.md
+++ b/doc/user/application_security/sast/index.md
@@ -61,7 +61,7 @@ is **not** `19.03.0`. See [troubleshooting information](#error-response-from-dae
 
 GitLab SAST supports a variety of languages, package managers, and frameworks. Our SAST security scanners also feature automatic language detection which works even for mixed-language projects. If any supported language is detected in project source code we will automatically run the appropriate SAST analyzers.
 
-You can also [view our language roadmap](https://about.gitlab.com/direction/secure/static-analysis/sast/#language-support) and [request other language support by opening an issue](https://gitlab.com/groups/gitlab-org/-/epics/297). 
+You can also [view our language roadmap](https://about.gitlab.com/direction/secure/static-analysis/sast/#language-support) and [request other language support by opening an issue](https://gitlab.com/groups/gitlab-org/-/epics/297).
 
 | Language (package managers) / framework                                                                                                          | Scan tool                                                                                                     | Introduced in GitLab Version                                                                                                                                          |
 |--------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|
diff --git a/doc/user/packages/composer_repository/index.md b/doc/user/packages/composer_repository/index.md
index 219ccef0a019b..ac8d6109dc9ce 100644
--- a/doc/user/packages/composer_repository/index.md
+++ b/doc/user/packages/composer_repository/index.md
@@ -24,7 +24,7 @@ can be any public or private repository.
    mkdir my-composer-package && cd my-composer-package
    ```
 
-1. Run [`composer init`](https://getcomposer.org/doc/03-cli.md#init) and answer the prompts. 
+1. Run [`composer init`](https://getcomposer.org/doc/03-cli.md#init) and answer the prompts.
 
    For namespace, enter your unique [namespace](../../../user/group/index.md#namespaces), like your GitLab username or group name.
 
@@ -71,7 +71,7 @@ Prerequisites:
 To publish the package:
 
 - Send a `POST` request to the [Packages API](../../../api/packages.md).
- 
+
   For example, you can use `curl`:
 
   ```shell
@@ -156,7 +156,7 @@ To install a package:
 1. Create an `auth.json` file with your GitLab credentials:
 
    ```shell
-   composer config gitlab-token.<DOMAIN-NAME> <personal_access_token> 
+   composer config gitlab-token.<DOMAIN-NAME> <personal_access_token>
    ```
 
 Output indicates that the package has been successfully installed.
diff --git a/doc/user/packages/conan_repository/index.md b/doc/user/packages/conan_repository/index.md
index 1f485de6293af..10c820a86bec0 100644
--- a/doc/user/packages/conan_repository/index.md
+++ b/doc/user/packages/conan_repository/index.md
@@ -223,7 +223,7 @@ To publish a Conan package, you need:
 
 - The Package Registry [set as a remote](#add-the-package-registry-as-a-conan-remote).
 - [Authentication](#authenticate-to-the-package-registry) set up with the Package Registry.
-- A local [Conan package](https://docs.conan.io/en/latest/creating_packages/getting_started.html). 
+- A local [Conan package](https://docs.conan.io/en/latest/creating_packages/getting_started.html).
   - For an instance remote, the package must meet the [naming convention](#package-recipe-naming-convention-for-instance-remotes).
 - A project ID, which is on the project's homepage.
 
@@ -276,12 +276,12 @@ To install a Conan package, you need:
 
 1. Add the Conan recipe to the `[requires]` section of the file:
 
-   ```ini
-    [requires]
-    Hello/0.1@mycompany/beta
-   
-    [generators]
-    cmake
+   ```plaintext
+   [requires]
+   Hello/0.1@mycompany/beta
+
+   [generators]
+   cmake
    ```
 
 1. At the root of your project, create a `build` directory and change to that directory:
@@ -316,7 +316,7 @@ There are two ways to remove a Conan package from the GitLab Package Registry.
   NOTE: **Note:**
   This command removes all recipe and binary package files from the Package Registry.
 
-- From the GitLab user interface: 
+- From the GitLab user interface:
 
   Go to your project's **Packages & Registries > Package Registry**. Remove the package by clicking the red trash icon.
 
diff --git a/doc/user/packages/container_registry/index.md b/doc/user/packages/container_registry/index.md
index c755e8c33444f..12ed5576df1a2 100644
--- a/doc/user/packages/container_registry/index.md
+++ b/doc/user/packages/container_registry/index.md
@@ -113,9 +113,9 @@ To authenticate, run the `docker` command. For example:
 
 To build and push to the Container Registry:
 
-1. Authenticate with the Container Registry. 
+1. Authenticate with the Container Registry.
 
-1. Run the command to build or push. For example, to build: 
+1. Run the command to build or push. For example, to build:
 
    ```shell
    docker build -t registry.example.com/group/project/image .
@@ -181,7 +181,7 @@ You can configure your `.gitlab-ci.yml` file to build and push images to the Con
   longer, but it ensures your image is up-to-date.
 - Before each `docker run`, do an explicit `docker pull` to fetch
   the image that was just built. This is especially important if you are
-  using multiple runners that cache images locally.   
+  using multiple runners that cache images locally.
 
   If you use the Git SHA in your image tag, each job is unique and you
   should never have a stale image. However, it's still possible to have a
@@ -603,7 +603,7 @@ are not deleted by the cleanup policy.
 
 ## Disable the Container Registry for a project
 
-The Container Registry is enabled by default. 
+The Container Registry is enabled by default.
 
 You can, however, remove the Container Registry for a project:
 
diff --git a/doc/user/packages/npm_registry/index.md b/doc/user/packages/npm_registry/index.md
index edd097d04c2dd..f15b31d8b67e4 100644
--- a/doc/user/packages/npm_registry/index.md
+++ b/doc/user/packages/npm_registry/index.md
@@ -290,7 +290,7 @@ Administrators can disable this behavior in the [Continuous Integration settings
 
 You can route package requests to organizations and users outside of GitLab.
 
-To do this, add lines to your `.npmrc` file, replacing `my-org` with the namespace or group that owns your project's repository. The name is case-sensitive and must match the name of your group or namespace exactly. 
+To do this, add lines to your `.npmrc` file, replacing `my-org` with the namespace or group that owns your project's repository. The name is case-sensitive and must match the name of your group or namespace exactly.
 
 ```shell
 @foo:registry=https://gitlab.example.com/api/v4/packages/npm/
@@ -442,7 +442,7 @@ npm install @scope/package@my-tag              # Install a specific tag
 ```
 
 NOTE: **Note:**
-You cannot use your `CI_JOB_TOKEN` or deploy token with the `npm dist-tag` commands. View [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/258835) for details. 
+You cannot use your `CI_JOB_TOKEN` or deploy token with the `npm dist-tag` commands. View [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/258835) for details.
 
 CAUTION: **Warning:**
 Due to a bug in NPM 6.9.0, deleting dist tags fails. Make sure your NPM version is greater than 6.9.1.
diff --git a/doc/user/project/code_owners.md b/doc/user/project/code_owners.md
index 730a9ada4285f..7c71d18e5be64 100644
--- a/doc/user/project/code_owners.md
+++ b/doc/user/project/code_owners.md
@@ -158,7 +158,7 @@ file.md @group-x @group-x/subgroup-y
 ### Code Owners Sections **(PREMIUM)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/12137) in [GitLab Premium](https://about.gitlab.com/pricing/) 13.2 behind a feature flag, enabled by default.
-> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42389) in GitLab 13.4. 
+> - [Feature flag removed](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/42389) in GitLab 13.4.
 
 Code Owner rules can be grouped into named sections. This allows for better
 organization of broader categories of Code Owner rules to be applied.
diff --git a/doc/user/project/deploy_boards.md b/doc/user/project/deploy_boards.md
index b23f22695998d..66c681ab5b9b0 100644
--- a/doc/user/project/deploy_boards.md
+++ b/doc/user/project/deploy_boards.md
@@ -107,7 +107,7 @@ To display the Deploy Boards for a specific [environment](../../ci/environments/
    be done automatically and no action is necessary.
 
    If you are using GCP to manage clusters, you can see the deployment details in GCP itself by going to **Workloads > deployment name > Details**:
-   
+
    ![Deploy Boards Kubernetes Label](img/deploy_boards_kubernetes_label.png)
 
 Once all of the above are set up and the pipeline has run at least once,
diff --git a/doc/user/project/issue_board.md b/doc/user/project/issue_board.md
index 7dabda283de44..292143712dc3b 100644
--- a/doc/user/project/issue_board.md
+++ b/doc/user/project/issue_board.md
@@ -58,7 +58,7 @@ Here are some common use cases for issue boards.
 
 ### Use cases for a single issue board
 
-With the GitLab Workflow you can discuss proposals in issues, label 
+With the GitLab Workflow you can discuss proposals in issues, label
 them, and organize and prioritize them with issue boards.
 
 For example, let's consider this simplified development workflow:
@@ -169,9 +169,9 @@ At this point, that issue is assigned a relative order value by the system,
 with respect to the other issues in the list. Any time
 you drag and reorder the issue, its relative order value changes accordingly.
 
-Also, any time that issue appears in any board, the ordering is done according to 
+Also, any time that issue appears in any board, the ordering is done according to
 the updated relative order value. It's only the first
-time an issue appears that it takes from the priority order mentioned above. If a user in your GitLab instance 
+time an issue appears that it takes from the priority order mentioned above. If a user in your GitLab instance
 drags issue `A` above issue `B`, the ordering is maintained when these two issues are subsequently
 loaded in any board in the same instance. This could be a different project board or a different group
 board, for example.
diff --git a/doc/user/project/issues/issue_data_and_actions.md b/doc/user/project/issues/issue_data_and_actions.md
index 95d7f2edac528..6e10aba714cee 100644
--- a/doc/user/project/issues/issue_data_and_actions.md
+++ b/doc/user/project/issues/issue_data_and_actions.md
@@ -80,7 +80,7 @@ The button to do this has a different label depending on whether the issue is al
 List or not. If the issue is:
 
 - Already on your To-Do List: The button is labeled **Mark as done**. Click the button to remove the issue from your To-Do List.
-- Not on your To-Do List: The button is labeled **Add a To Do**. Click the button to add the issue to your To-Do List.
+- Not on your To-Do List: The button is labeled **Add a to do**. Click the button to add the issue to your To-Do List.
 
 ### Assignee
 
diff --git a/doc/user/project/merge_requests/test_coverage_visualization.md b/doc/user/project/merge_requests/test_coverage_visualization.md
index b81158c365396..c0cbcf492fd97 100644
--- a/doc/user/project/merge_requests/test_coverage_visualization.md
+++ b/doc/user/project/merge_requests/test_coverage_visualization.md
@@ -97,7 +97,7 @@ test-jdk11:
       - target/site/jacoco/jacoco.xml
 
 coverage-jdk11:
-  # Must be in a stage later than test-jdk11's stage. 
+  # Must be in a stage later than test-jdk11's stage.
   # The `visualize` stage does not exist by default.
   # Please define it first, or chose an existing stage like `deploy`.
   stage: visualize
@@ -137,7 +137,7 @@ test-jdk11:
       - build/jacoco/jacoco.xml
 
 coverage-jdk11:
-  # Must be in a stage later than test-jdk11's stage. 
+  # Must be in a stage later than test-jdk11's stage.
   # The `visualize` stage does not exist by default.
   # Please define it first, or chose an existing stage like `deploy`.
   stage: visualize
diff --git a/doc/user/search/advanced_search_syntax.md b/doc/user/search/advanced_search_syntax.md
index 5817852dd9770..36628ad02ffe5 100644
--- a/doc/user/search/advanced_search_syntax.md
+++ b/doc/user/search/advanced_search_syntax.md
@@ -62,7 +62,7 @@ The Advanced Search Syntax also supports the use of filters. The available filte
 - filename: Filters by filename. You can use the glob (`*`) operator for fuzzy matching.
 - path: Filters by path. You can use the glob (`*`) operator for fuzzy matching.
 - extension: Filters by extension in the filename. Please write the extension without a leading dot. Exact match only.
-- blob: Filters by Git `object-id`. Exact match only.
+- blob: Filters by Git `object ID`. Exact match only.
 
 To use them, simply add them to your query in the format `<filter_name>:<value>` without
  any spaces between the colon (`:`) and the value.
@@ -73,6 +73,7 @@ Examples:
 - Finding a file named `found_blob_spec.rb` with the text `CHANGELOG` inside of it: [`CHANGELOG filename:found_blob_spec.rb](https://gitlab.com/search?utf8=%E2%9C%93&snippets=&scope=blobs&repository_ref=&search=CHANGELOG+filename%3Afound_blob_spec.rb&group_id=9970&project_id=278964)
 - Finding the text `EpicLinks` inside files with the `.rb` extension: [`EpicLinks extension:rb`](https://gitlab.com/search?utf8=%E2%9C%93&snippets=&scope=blobs&repository_ref=&search=EpicLinks+extension%3Arb&group_id=9970&project_id=278964)
 - Finding the text `Sidekiq` in a file, when that file is in a path that includes `elastic`: [`Sidekiq path:elastic`](https://gitlab.com/search?utf8=%E2%9C%93&snippets=&scope=blobs&repository_ref=&search=Sidekiq+path%3Aelastic&group_id=9970&project_id=278964)
+- Finding the files represented by the Git object ID `998707b421c89bd9a3063333f9f728ef3e43d101`: [`* blob:998707b421c89bd9a3063333f9f728ef3e43d101`](https://gitlab.com/search?utf8=%E2%9C%93&snippets=false&scope=blobs&repository_ref=&search=*+blob%3A998707b421c89bd9a3063333f9f728ef3e43d101&group_id=9970)
 - Syntax filters can be combined for complex filtering. Finding any file starting with `search` containing `eventHub` and with the `.js` extension: [`eventHub filename:search* extension:js`](https://gitlab.com/search?utf8=%E2%9C%93&snippets=&scope=blobs&repository_ref=&search=eventHub+filename%3Asearch*+extension%3Ajs&group_id=9970&project_id=278964)
 
 #### Excluding filters
diff --git a/doc/user/search/index.md b/doc/user/search/index.md
index aa99455e1cf84..f52106e4fa887 100644
--- a/doc/user/search/index.md
+++ b/doc/user/search/index.md
@@ -229,7 +229,7 @@ backed by the database and allows searching in:
 - Commits (Project only)
 - Wiki (Project only)
 
-To start a search, type into the search bar on the top-right of the screen. You can always search 
+To start a search, type into the search bar on the top-right of the screen. You can always search
 in all GitLab and may also see the options to search within a group or project if you are in the
 group or project dashboard.
 
@@ -239,7 +239,7 @@ Once the results are returned, you can modify the search, select a different typ
 search, or choose a specific group or project.
 
 ![basic_search_results](img/basic_search_results.png)
- 
+
 ### Code search
 
 To search through code or other documents in a single project, you can use
diff --git a/doc/user/todos.md b/doc/user/todos.md
index 46f589c1b1191..67e248d0e686c 100644
--- a/doc/user/todos.md
+++ b/doc/user/todos.md
@@ -93,8 +93,12 @@ for filtering purposes; otherwise, they appear as normal.
 
 ### Manually creating a to do
 
-You can add an issue or merge request (or epic **(ULTIMATE)**) to your
-To-Do List by clicking its **Add a To Do** button.
+You can also add the following to your To-Do List by clicking the **Add a to do** button on an:
+
+- [Issue](project/issues/index.md)
+- [Merge Request](project/merge_requests/index.md)
+- [Epic](group/epics/index.md) **(ULTIMATE)**
+- [Design](project/issues/design_management.md)
 
 ![Adding a To Do from the issuable sidebar](img/todos_add_todo_sidebar.png)
 
diff --git a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml
index 3b87d53f16555..a7352f770d682 100644
--- a/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml
+++ b/lib/gitlab/ci/templates/Jobs/Test.gitlab-ci.yml
@@ -1,9 +1,10 @@
 test:
   variables:
-    POSTGRES_VERSION: 9.6.16
+    POSTGRES_VERSION: 9.6.16 # This is the version used by Auto Deploy by default, see https://hub.docker.com/r/bitnami/postgresql/tags for available tags
     POSTGRES_DB: test
   services:
-    - "postgres:${POSTGRES_VERSION}"
+    - name: "bitnami/postgresql:${POSTGRES_VERSION}"
+      alias: postgres
   stage: test
   image: gliderlabs/herokuish:latest
   needs: []
diff --git a/lib/gitlab/quick_actions/issuable_actions.rb b/lib/gitlab/quick_actions/issuable_actions.rb
index 6aa3f515ef0d3..efe07aa8ab2d9 100644
--- a/lib/gitlab/quick_actions/issuable_actions.rb
+++ b/lib/gitlab/quick_actions/issuable_actions.rb
@@ -145,9 +145,9 @@ module IssuableActions
           run_label_command(labels: find_labels(labels_param), command: :relabel, updates_key: :label_ids)
         end
 
-        desc _('Add a To Do')
-        explanation _('Adds a To Do.')
-        execution_message _('Added a To Do.')
+        desc _('Add a to do')
+        explanation _('Adds a to do.')
+        execution_message _('Added a to do.')
         types Issuable
         condition do
           quick_action_target.persisted? &&
@@ -157,9 +157,9 @@ module IssuableActions
           @updates[:todo_event] = 'add'
         end
 
-        desc _('Mark To Do as done')
-        explanation _('Marks To Do as done.')
-        execution_message _('Marked To Do as done.')
+        desc _('Mark to do as done')
+        explanation _('Marks to do as done.')
+        execution_message _('Marked to do as done.')
         types Issuable
         condition do
           quick_action_target.persisted? &&
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index fd2a50ade56d8..5718043523c4b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -1613,6 +1613,9 @@ msgstr ""
 msgid "Add a task list"
 msgstr ""
 
+msgid "Add a to do"
+msgstr ""
+
 msgid "Add additional text to appear in all email communications. %{character_limit} character limit"
 msgstr ""
 
@@ -1766,7 +1769,7 @@ msgstr ""
 msgid "Added %{label_references} %{label_text}."
 msgstr ""
 
-msgid "Added a To Do."
+msgid "Added a to do."
 msgstr ""
 
 msgid "Added an issue to an epic."
@@ -1802,10 +1805,10 @@ msgstr ""
 msgid "Adds %{labels} %{label_text}."
 msgstr ""
 
-msgid "Adds a To Do."
+msgid "Adds a Zoom meeting"
 msgstr ""
 
-msgid "Adds a Zoom meeting"
+msgid "Adds a to do."
 msgstr ""
 
 msgid "Adds an issue to an epic."
@@ -11281,6 +11284,9 @@ msgstr ""
 msgid "File upload error."
 msgstr ""
 
+msgid "Filename"
+msgstr ""
+
 msgid "Files"
 msgstr ""
 
@@ -15636,9 +15642,6 @@ msgstr ""
 msgid "March"
 msgstr ""
 
-msgid "Mark To Do as done"
-msgstr ""
-
 msgid "Mark as done"
 msgstr ""
 
@@ -15657,6 +15660,9 @@ msgstr ""
 msgid "Mark this issue as related to another issue"
 msgstr ""
 
+msgid "Mark to do as done"
+msgstr ""
+
 msgid "Markdown"
 msgstr ""
 
@@ -15690,9 +15696,6 @@ msgstr ""
 msgid "Marked For Deletion At - %{deletion_time}"
 msgstr ""
 
-msgid "Marked To Do as done."
-msgstr ""
-
 msgid "Marked this %{noun} as Work In Progress."
 msgstr ""
 
@@ -15702,7 +15705,7 @@ msgstr ""
 msgid "Marked this issue as related to %{issue_ref}."
 msgstr ""
 
-msgid "Marks To Do as done."
+msgid "Marked to do as done."
 msgstr ""
 
 msgid "Marks this %{noun} as Work In Progress."
@@ -15714,6 +15717,9 @@ msgstr ""
 msgid "Marks this issue as related to %{issue_ref}."
 msgstr ""
 
+msgid "Marks to do as done."
+msgstr ""
+
 msgid "Mask variable"
 msgstr ""
 
@@ -29093,6 +29099,9 @@ msgstr ""
 msgid "What describes you best?"
 msgstr ""
 
+msgid "What is squashing?"
+msgstr ""
+
 msgid "What's new at GitLab"
 msgstr ""
 
diff --git a/spec/features/dashboard/todos/todos_spec.rb b/spec/features/dashboard/todos/todos_spec.rb
index 7243b5d348323..0b4fed55f110e 100644
--- a/spec/features/dashboard/todos/todos_spec.rb
+++ b/spec/features/dashboard/todos/todos_spec.rb
@@ -228,7 +228,7 @@
     describe 'restoring the todo' do
       before do
         within first('.todo') do
-          click_link 'Add a To Do'
+          click_link 'Add a to do'
         end
       end
 
@@ -243,7 +243,7 @@
     end
   end
 
-  context 'User has Todos with labels spanning multiple projects' do
+  context 'User has to dos with labels spanning multiple projects' do
     before do
       label1 = create(:label, project: project)
       note1 = create(:note_on_issue, note: "Hello #{label1.to_reference(format: :name)}", noteable_id: issue.id, noteable_type: 'Issue', project: issue.project)
diff --git a/spec/features/issues/todo_spec.rb b/spec/features/issues/todo_spec.rb
index 3de33049db095..315d1c911a27f 100644
--- a/spec/features/issues/todo_spec.rb
+++ b/spec/features/issues/todo_spec.rb
@@ -15,7 +15,7 @@
 
   it 'creates todo when clicking button' do
     page.within '.issuable-sidebar' do
-      click_button 'Add a To Do'
+      click_button 'Add a to do'
       expect(page).to have_content 'Mark as done'
     end
 
@@ -32,7 +32,7 @@
 
   it 'marks a todo as done' do
     page.within '.issuable-sidebar' do
-      click_button 'Add a To Do'
+      click_button 'Add a to do'
       click_button 'Mark as done'
     end
 
diff --git a/spec/features/projects/navbar_spec.rb b/spec/features/projects/navbar_spec.rb
index 07f65fe62dfcc..8731a1673b1f3 100644
--- a/spec/features/projects/navbar_spec.rb
+++ b/spec/features/projects/navbar_spec.rb
@@ -21,7 +21,7 @@
 
     if Gitlab.ee?
       insert_after_sub_nav_item(
-        _('Kubernetes'),
+        _('Environments'),
         within: _('Operations'),
         new_sub_nav_item_name: _('Feature Flags')
       )
diff --git a/spec/frontend/collapsed_sidebar_todo_spec.js b/spec/frontend/collapsed_sidebar_todo_spec.js
index b1a304fabcd9d..86f4c450c05af 100644
--- a/spec/frontend/collapsed_sidebar_todo_spec.js
+++ b/spec/frontend/collapsed_sidebar_todo_spec.js
@@ -59,7 +59,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
   it('sets default tooltip title', () => {
     expect(
       document.querySelector('.js-issuable-todo.sidebar-collapsed-icon').getAttribute('title'),
-    ).toBe('Add a To Do');
+    ).toBe('Add a to do');
   });
 
   it('toggle todo state', done => {
@@ -125,7 +125,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
 
         expect(
           document.querySelector('.issuable-sidebar-header .js-issuable-todo').textContent.trim(),
-        ).toBe('Add a To Do');
+        ).toBe('Add a to do');
       })
       .then(done)
       .catch(done.fail);
@@ -164,7 +164,7 @@ describe('Issuable right sidebar collapsed todo toggle', () => {
           document
             .querySelector('.js-issuable-todo.sidebar-collapsed-icon')
             .getAttribute('aria-label'),
-        ).toBe('Add a To Do');
+        ).toBe('Add a to do');
       })
       .then(done)
       .catch(done.fail);
diff --git a/spec/frontend/cycle_analytics/stage_nav_item_spec.js b/spec/frontend/cycle_analytics/stage_nav_item_spec.js
index 1fe80d3b1ce7b..d577d0b602a9f 100644
--- a/spec/frontend/cycle_analytics/stage_nav_item_spec.js
+++ b/spec/frontend/cycle_analytics/stage_nav_item_spec.js
@@ -118,7 +118,7 @@ describe('StageNavItem', () => {
       expect(wrapper.find('.stage-median').text()).toBe('Not available');
     });
     it('does not render options menu', () => {
-      expect(wrapper.find('.more-actions-toggle').exists()).toBe(false);
+      expect(wrapper.find('[data-testid="more-actions-toggle"]').exists()).toBe(false);
     });
   });
 
@@ -135,7 +135,7 @@ describe('StageNavItem', () => {
     });
 
     it('does not render options menu', () => {
-      expect(wrapper.find('.more-actions-toggle').exists()).toBe(false);
+      expect(wrapper.find('[data-testid="more-actions-toggle"]').exists()).toBe(false);
     });
 
     it('can not edit the stage', () => {
diff --git a/spec/frontend/design_management/components/__snapshots__/design_scaler_spec.js.snap b/spec/frontend/design_management/components/__snapshots__/design_scaler_spec.js.snap
index cb4575cbd11d1..0679b485f778c 100644
--- a/spec/frontend/design_management/components/__snapshots__/design_scaler_spec.js.snap
+++ b/spec/frontend/design_management/components/__snapshots__/design_scaler_spec.js.snap
@@ -10,7 +10,7 @@ exports[`Design management design scaler component minus and reset buttons are d
     disabled="disabled"
   >
     <span
-      class="d-flex-center gl-icon s16"
+      class="gl-display-flex gl-justify-content-center gl-align-items-center gl-icon s16"
     >
       
       –
@@ -48,7 +48,7 @@ exports[`Design management design scaler component minus and reset buttons are e
     class="btn"
   >
     <span
-      class="d-flex-center gl-icon s16"
+      class="gl-display-flex gl-justify-content-center gl-align-items-center gl-icon s16"
     >
       
       –
@@ -85,7 +85,7 @@ exports[`Design management design scaler component plus button is disabled when
     class="btn"
   >
     <span
-      class="d-flex-center gl-icon s16"
+      class="gl-display-flex gl-justify-content-center gl-align-items-center gl-icon s16"
     >
       
       –
diff --git a/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap b/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
index acaa62b11eb16..7cffd3cf3e89f 100644
--- a/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
+++ b/spec/frontend/design_management/components/__snapshots__/image_spec.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Design management large image component renders image 1`] = `
 <div
-  class="m-auto js-design-image"
+  class="gl-mx-auto gl-my-auto js-design-image"
 >
   <!---->
    
@@ -16,7 +16,7 @@ exports[`Design management large image component renders image 1`] = `
 
 exports[`Design management large image component renders loading state 1`] = `
 <div
-  class="m-auto js-design-image"
+  class="gl-mx-auto gl-my-auto js-design-image"
   isloading="true"
 >
   <!---->
@@ -31,7 +31,7 @@ exports[`Design management large image component renders loading state 1`] = `
 
 exports[`Design management large image component renders media broken icon on error 1`] = `
 <gl-icon-stub
-  class="text-secondary-100"
+  class="gl-text-gray-200"
   name="media-broken"
   size="48"
 />
@@ -39,7 +39,7 @@ exports[`Design management large image component renders media broken icon on er
 
 exports[`Design management large image component sets correct classes and styles if imageStyle is set 1`] = `
 <div
-  class="m-auto js-design-image"
+  class="gl-mx-auto gl-my-auto js-design-image"
 >
   <!---->
    
@@ -54,7 +54,7 @@ exports[`Design management large image component sets correct classes and styles
 
 exports[`Design management large image component zoom sets image style when zoomed 1`] = `
 <div
-  class="m-auto js-design-image"
+  class="gl-mx-auto gl-my-auto js-design-image"
 >
   <!---->
    
diff --git a/spec/frontend/design_management/pages/index_spec.js b/spec/frontend/design_management/pages/index_spec.js
index 55ccb668e81df..e44333a5fcea4 100644
--- a/spec/frontend/design_management/pages/index_spec.js
+++ b/spec/frontend/design_management/pages/index_spec.js
@@ -651,7 +651,7 @@ describe('Design management index page', () => {
 
   describe('when navigating', () => {
     it('ensures fullscreen layout is not applied', () => {
-      createComponent(true);
+      createComponent({ loading: true });
 
       expect(mockPageEl.classList.remove).toHaveBeenCalledTimes(1);
       expect(mockPageEl.classList.remove).toHaveBeenCalledWith(...DESIGN_DETAIL_LAYOUT_CLASSLIST);
@@ -661,7 +661,7 @@ describe('Design management index page', () => {
       router.replace({
         path: '/designs',
       });
-      createComponent(true);
+      createComponent({ loading: true });
 
       return wrapper.vm.$nextTick().then(() => {
         expect(scrollIntoViewMock).toHaveBeenCalled();
diff --git a/spec/frontend/lib/utils/text_markdown_spec.js b/spec/frontend/lib/utils/text_markdown_spec.js
index 1aaae80dcdf3b..fd8a66baa13ef 100644
--- a/spec/frontend/lib/utils/text_markdown_spec.js
+++ b/spec/frontend/lib/utils/text_markdown_spec.js
@@ -13,6 +13,23 @@ describe('init markdown', () => {
     textArea.parentNode.removeChild(textArea);
   });
 
+  describe('insertMarkdownText', () => {
+    it('will not error if selected text is a number', () => {
+      const selected = 2;
+
+      insertMarkdownText({
+        textArea,
+        text: '',
+        tag: '',
+        blockTag: null,
+        selected,
+        wrap: false,
+      });
+
+      expect(textArea.value).toBe(selected.toString());
+    });
+  });
+
   describe('textArea', () => {
     describe('without selection', () => {
       it('inserts the tag on an empty line', () => {
diff --git a/spec/frontend/notes/components/timeline_toggle_spec.js b/spec/frontend/notes/components/timeline_toggle_spec.js
index ded5677dbbcd8..b8df6fc799626 100644
--- a/spec/frontend/notes/components/timeline_toggle_spec.js
+++ b/spec/frontend/notes/components/timeline_toggle_spec.js
@@ -7,6 +7,8 @@ import TimelineToggle, {
 } from '~/notes/components/timeline_toggle.vue';
 import createStore from '~/notes/stores';
 import { ASC, DESC } from '~/notes/constants';
+import { trackToggleTimelineView } from '~/notes/utils';
+import Tracking from '~/tracking';
 
 const localVue = createLocalVue();
 localVue.use(Vuex);
@@ -18,6 +20,7 @@ describe('Timeline toggle', () => {
 
   const createComponent = () => {
     jest.spyOn(store, 'dispatch').mockImplementation();
+    jest.spyOn(Tracking, 'event').mockImplementation();
 
     wrapper = shallowMount(TimelineToggle, {
       localVue,
@@ -39,6 +42,7 @@ describe('Timeline toggle', () => {
     }
     store.dispatch.mockReset();
     mockEvent.currentTarget.blur.mockReset();
+    Tracking.event.mockReset();
   });
 
   describe('ON state', () => {
@@ -66,6 +70,16 @@ describe('Timeline toggle', () => {
       expect(findGlButton().attributes('selected')).toBe('true');
       expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
     });
+
+    it('should track Snowplow event', async () => {
+      store.state.isTimelineEnabled = true;
+      await wrapper.vm.$nextTick();
+
+      findGlButton().trigger('click');
+
+      const { category, action, label, property, value } = trackToggleTimelineView(true);
+      expect(Tracking.event).toHaveBeenCalledWith(category, action, { label, property, value });
+    });
   });
 
   describe('OFF state', () => {
@@ -89,5 +103,15 @@ describe('Timeline toggle', () => {
       expect(findGlButton().attributes('selected')).toBe(undefined);
       expect(mockEvent.currentTarget.blur).toHaveBeenCalled();
     });
+
+    it('should track Snowplow event', async () => {
+      store.state.isTimelineEnabled = false;
+      await wrapper.vm.$nextTick();
+
+      findGlButton().trigger('click');
+
+      const { category, action, label, property, value } = trackToggleTimelineView(false);
+      expect(Tracking.event).toHaveBeenCalledWith(category, action, { label, property, value });
+    });
   });
 });
diff --git a/spec/frontend/pipelines/test_reports/mock_data.js b/spec/frontend/pipelines/test_reports/mock_data.js
index 872cb5c87bed5..c3ca14298424c 100644
--- a/spec/frontend/pipelines/test_reports/mock_data.js
+++ b/spec/frontend/pipelines/test_reports/mock_data.js
@@ -3,6 +3,7 @@ import { TestStatus } from '~/pipelines/constants';
 export default [
   {
     classname: 'spec.test_spec',
+    file: 'spec/trace_spec.rb',
     execution_time: 0,
     name: 'Test#skipped text',
     stack_trace: null,
@@ -11,6 +12,7 @@ export default [
   },
   {
     classname: 'spec.test_spec',
+    file: 'spec/trace_spec.rb',
     execution_time: 0,
     name: 'Test#error text',
     stack_trace: null,
@@ -19,6 +21,7 @@ export default [
   },
   {
     classname: 'spec.test_spec',
+    file: 'spec/trace_spec.rb',
     execution_time: 0,
     name: 'Test#unknown text',
     stack_trace: null,
diff --git a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js
index af2150be7a091..838e0606375b4 100644
--- a/spec/frontend/pipelines/test_reports/test_suite_table_spec.js
+++ b/spec/frontend/pipelines/test_reports/test_suite_table_spec.js
@@ -1,6 +1,7 @@
 import Vuex from 'vuex';
 import { shallowMount, createLocalVue } from '@vue/test-utils';
 import { getJSONFixture } from 'helpers/fixtures';
+import { GlButton } from '@gitlab/ui';
 import SuiteTable from '~/pipelines/components/test_reports/test_suite_table.vue';
 import * as getters from '~/pipelines/stores/test_reports/getters';
 import { TestStatus } from '~/pipelines/constants';
@@ -73,5 +74,15 @@ describe('Test reports suite table', () => {
 
       expect(findIconForRow(row, status).exists()).toBe(true);
     });
+
+    it('renders the file name for the test with a copy button', () => {
+      const { file } = testCases[0];
+      const row = findCaseRowAtIndex(0);
+      const button = row.find(GlButton);
+
+      expect(row.text()).toContain(file);
+      expect(button.exists()).toBe(true);
+      expect(button.attributes('data-clipboard-text')).toBe(file);
+    });
   });
 });
diff --git a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
index 4c213899dbdf4..5326d63cb8ad8 100644
--- a/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
+++ b/spec/frontend/vue_mr_widget/components/states/mr_widget_squash_before_merge_spec.js
@@ -1,5 +1,6 @@
 import { createLocalVue, shallowMount } from '@vue/test-utils';
 import SquashBeforeMerge from '~/vue_merge_request_widget/components/states/squash_before_merge.vue';
+import { SQUASH_BEFORE_MERGE } from '~/vue_merge_request_widget/i18n';
 
 const localVue = createLocalVue();
 
@@ -85,7 +86,7 @@ describe('Squash before merge component', () => {
   });
 
   describe('tooltip', () => {
-    const tooltipTitle = () => findLabel().element.dataset.title;
+    const tooltipTitle = () => findLabel().attributes('title');
 
     it('does not render when isDisabled is false', () => {
       createComponent({
@@ -101,7 +102,7 @@ describe('Squash before merge component', () => {
         isDisabled: true,
       });
 
-      expect(tooltipTitle()).toBe('Required in this project.');
+      expect(tooltipTitle()).toBe(SQUASH_BEFORE_MERGE.tooltipTitle);
     });
   });
 
diff --git a/spec/presenters/snippet_blob_presenter_spec.rb b/spec/presenters/snippet_blob_presenter_spec.rb
index ec77f8cdb4af8..83fe37effc082 100644
--- a/spec/presenters/snippet_blob_presenter_spec.rb
+++ b/spec/presenters/snippet_blob_presenter_spec.rb
@@ -125,24 +125,70 @@
     let_it_be(:personal_snippet) { create(:personal_snippet, :repository, author: user) }
     let_it_be(:project_snippet)  { create(:project_snippet, :repository, project: project, author: user) }
 
+    let(:blob) { snippet.blobs.first }
+
     before do
       project.add_developer(user)
     end
 
     describe '#raw_path' do
-      subject { described_class.new(snippet.blobs.first, current_user: user).raw_path }
+      subject { described_class.new(blob, current_user: user).raw_path }
 
       it_behaves_like 'snippet blob raw path'
+
+      context 'with a snippet without a repository' do
+        let(:personal_snippet) { build(:personal_snippet, author: user, id: 1) }
+        let(:project_snippet)  { build(:project_snippet, project: project, author: user, id: 1) }
+        let(:blob) { snippet.blob }
+
+        context 'with ProjectSnippet' do
+          let(:snippet) { project_snippet }
+
+          it 'returns the raw project snippet path' do
+            expect(subject).to eq("/#{project_snippet.project.full_path}/-/snippets/#{project_snippet.id}/raw")
+          end
+        end
+
+        context 'with PersonalSnippet' do
+          let(:snippet) { personal_snippet }
+
+          it 'returns the raw personal snippet path' do
+            expect(subject).to eq("/-/snippets/#{personal_snippet.id}/raw")
+          end
+        end
+      end
     end
 
     describe '#raw_url' do
-      subject { described_class.new(snippet.blobs.first, current_user: user).raw_url }
+      subject { described_class.new(blob, current_user: user).raw_url }
 
       before do
         stub_default_url_options(host: 'test.host')
       end
 
       it_behaves_like 'snippet blob raw url'
+
+      context 'with a snippet without a repository' do
+        let(:personal_snippet) { build(:personal_snippet, author: user, id: 1) }
+        let(:project_snippet)  { build(:project_snippet, project: project, author: user, id: 1) }
+        let(:blob) { snippet.blob }
+
+        context 'with ProjectSnippet' do
+          let(:snippet) { project_snippet }
+
+          it 'returns the raw project snippet url' do
+            expect(subject).to eq("http://test.host/#{project_snippet.project.full_path}/-/snippets/#{project_snippet.id}/raw")
+          end
+        end
+
+        context 'with PersonalSnippet' do
+          let(:snippet) { personal_snippet }
+
+          it 'returns the raw personal snippet url' do
+            expect(subject).to eq("http://test.host/-/snippets/#{personal_snippet.id}/raw")
+          end
+        end
+      end
     end
   end
 
diff --git a/spec/services/quick_actions/interpret_service_spec.rb b/spec/services/quick_actions/interpret_service_spec.rb
index 8f0c60d5d65c4..6f3814095f992 100644
--- a/spec/services/quick_actions/interpret_service_spec.rb
+++ b/spec/services/quick_actions/interpret_service_spec.rb
@@ -228,7 +228,7 @@
       it 'returns the todo message' do
         _, _, message = service.execute(content, issuable)
 
-        expect(message).to eq('Added a To Do.')
+        expect(message).to eq('Added a to do.')
       end
     end
 
@@ -244,7 +244,7 @@
         TodoService.new.mark_todo(issuable, developer)
         _, _, message = service.execute(content, issuable)
 
-        expect(message).to eq('Marked To Do as done.')
+        expect(message).to eq('Marked to do as done.')
       end
     end
 
diff --git a/spec/support/shared_contexts/navbar_structure_context.rb b/spec/support/shared_contexts/navbar_structure_context.rb
index 747358fc1e001..e58cbad726cc7 100644
--- a/spec/support/shared_contexts/navbar_structure_context.rb
+++ b/spec/support/shared_contexts/navbar_structure_context.rb
@@ -64,14 +64,14 @@
         nav_item: _('Operations'),
         nav_sub_items: [
           _('Metrics'),
+          _('Logs'),
+          _('Error Tracking'),
           _('Alerts'),
           _('Incidents'),
-          _('Environments'),
-          _('Error Tracking'),
-          _('Product Analytics'),
           _('Serverless'),
-          _('Logs'),
-          _('Kubernetes')
+          _('Kubernetes'),
+          _('Environments'),
+          _('Product Analytics')
         ]
       },
       analytics_nav_item,
diff --git a/spec/tasks/gitlab/backup_rake_spec.rb b/spec/tasks/gitlab/backup_rake_spec.rb
index 63f4ad5b24101..8963164ac534a 100644
--- a/spec/tasks/gitlab/backup_rake_spec.rb
+++ b/spec/tasks/gitlab/backup_rake_spec.rb
@@ -299,7 +299,7 @@ def reenable_backup_sub_tasks
       end
 
       shared_examples 'includes repositories in all repository storages' do
-        specify :aggregate_failures, quarantine: 'https://gitlab.com/gitlab-org/gitlab/-/issues/263097' do
+        specify :aggregate_failures do
           project_a = create(:project, :repository)
           project_a.track_project_repository
           project_snippet_a = create(:project_snippet, :repository, project: project_a, author: project_a.owner)
@@ -331,11 +331,7 @@ def reenable_backup_sub_tasks
             "#{project_snippet_a.disk_path}.bundle",
             "#{project_snippet_b.disk_path}.bundle"
           ].each do |repo_name|
-            repo_lines = tar_lines.grep(/#{repo_name}/)
-
-            expect(repo_lines.size).to eq 1
-            # Checking that the size of the bundle is bigger than 0
-            expect(repo_lines.first.split[4].to_i > 0).to be true
+            expect(tar_lines.grep(/#{repo_name}/).size).to eq 1
           end
         end