From c36152ff8c41fad2f413f253eb7ac5c927e47c56 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Fri, 13 Mar 2020 15:09:21 +0000
Subject: Add latest changes from gitlab-org/gitlab@master

---
 .../boards/mixins/sortable_default_options.js      |   1 -
 .../components/ci_variable_modal.vue               | 118 +++--
 .../components/ci_variable_popover.vue             |  55 ++
 .../components/ci_variable_table.vue               | 104 +++-
 .../javascripts/ci_variable_list/constants.js      |  16 +-
 .../ci_variable_list/store/mutations.js            |   8 +-
 .../javascripts/ci_variable_list/store/state.js    |   8 +-
 .../javascripts/ci_variable_list/store/utils.js    |  24 +-
 .../contributors/components/contributors.vue       |  10 +-
 .../javascripts/contributors/stores/getters.js     |  10 +-
 app/assets/javascripts/reports/store/utils.js      |  13 +-
 .../sidebar/queries/updateStatus.mutation.graphql  |   7 +
 .../sidebar/services/sidebar_service.js            |  15 +-
 app/assets/javascripts/sidebar/sidebar_mediator.js |   2 +-
 app/assets/stylesheets/pages/settings.scss         |  27 +-
 app/helpers/issuables_helper.rb                    |   2 +-
 app/models/ci/bridge.rb                            |   2 +-
 app/models/ci/build.rb                             |   2 +-
 app/models/ci/pipeline.rb                          |   2 +-
 app/models/concerns/ci/has_ref.rb                  |  33 ++
 app/models/concerns/has_ref.rb                     |  31 --
 app/serializers/group_variable_entity.rb           |   1 +
 .../admin/application_settings/_ci_cd.html.haml    |   2 +-
 app/views/projects/settings/ci_cd/_form.html.haml  |  14 +-
 ...ate-between-errors-failures-in-xunit-result.yml |   5 +
 ...georgekoltsov-fix-relations-order-on-export.yml |   5 +
 .../unreleased/open-project-integration-2.yml      |   5 +
 .../repository-contributors-group-by-email.yml     |   5 +
 ...20200309162244_add_open_project_tracker_data.rb |  23 +
 .../20191115115043_migrate_epic_mentions_to_db.rb  |   4 +-
 ...00214173000_cleanup_empty_epic_user_mentions.rb |  30 --
 ...20200214174519_remigrate_epic_mentions_to_db.rb |  38 --
 ...14174607_remigrate_epic_notes_mentions_to_db.rb |  45 --
 db/schema.rb                                       |  16 +
 doc/README.md                                      |   2 +-
 doc/administration/compliance.md                   |   2 +-
 doc/api/projects.md                                |   2 +-
 doc/ci/README.md                                   |   6 +-
 doc/ci/environments.md                             |   2 +-
 doc/ci/examples/test-scala-application.md          |   2 +-
 doc/ci/img/collapsible_log_v12_6.png               | Bin 294959 -> 0 bytes
 doc/ci/img/job_failure_reason.png                  | Bin 5288 -> 0 bytes
 doc/ci/img/manual_job_variables.png                | Bin 111239 -> 0 bytes
 doc/ci/img/pipeline-delete.png                     | Bin 9658 -> 0 bytes
 doc/ci/img/pipeline_incremental_rollout.png        | Bin 4794 -> 0 bytes
 doc/ci/img/pipelines.png                           | Bin 6298 -> 0 bytes
 doc/ci/img/pipelines_duration_chart.png            | Bin 36476 -> 0 bytes
 doc/ci/img/pipelines_grouped.png                   | Bin 12888 -> 0 bytes
 doc/ci/img/pipelines_index.png                     | Bin 14896 -> 0 bytes
 doc/ci/img/pipelines_mini_graph.png                | Bin 4671 -> 0 bytes
 doc/ci/img/pipelines_mini_graph_simple.png         | Bin 961 -> 0 bytes
 doc/ci/img/pipelines_mini_graph_sorting.png        | Bin 10742 -> 0 bytes
 doc/ci/img/pipelines_success_chart.png             | Bin 76647 -> 0 bytes
 doc/ci/jenkins/index.md                            |  25 +-
 doc/ci/junit_test_reports.md                       |  12 +-
 .../pipelines_for_merged_results/index.md          |   2 +-
 doc/ci/multi_project_pipelines.md                  |   2 +-
 doc/ci/pipelines.md                                | 565 +-------------------
 doc/ci/pipelines/img/collapsible_log_v12_6.png     | Bin 0 -> 294959 bytes
 doc/ci/pipelines/img/job_failure_reason.png        | Bin 0 -> 5288 bytes
 doc/ci/pipelines/img/manual_job_variables.png      | Bin 0 -> 111239 bytes
 doc/ci/pipelines/img/pipeline-delete.png           | Bin 0 -> 9658 bytes
 .../pipelines/img/pipeline_incremental_rollout.png | Bin 0 -> 4794 bytes
 doc/ci/pipelines/img/pipelines.png                 | Bin 0 -> 6298 bytes
 doc/ci/pipelines/img/pipelines_duration_chart.png  | Bin 0 -> 36476 bytes
 doc/ci/pipelines/img/pipelines_grouped.png         | Bin 0 -> 12888 bytes
 doc/ci/pipelines/img/pipelines_index.png           | Bin 0 -> 14896 bytes
 doc/ci/pipelines/img/pipelines_mini_graph.png      | Bin 0 -> 4671 bytes
 .../pipelines/img/pipelines_mini_graph_simple.png  | Bin 0 -> 961 bytes
 .../pipelines/img/pipelines_mini_graph_sorting.png | Bin 0 -> 10742 bytes
 doc/ci/pipelines/img/pipelines_settings_badges.png | Bin 0 -> 21137 bytes
 .../img/pipelines_settings_test_coverage.png       | Bin 0 -> 2549 bytes
 doc/ci/pipelines/img/pipelines_success_chart.png   | Bin 0 -> 76647 bytes
 .../img/pipelines_test_coverage_build.png          | Bin 0 -> 4481 bytes
 .../img/pipelines_test_coverage_mr_widget.png      | Bin 0 -> 6375 bytes
 doc/ci/pipelines/index.md                          | 566 +++++++++++++++++++++
 doc/ci/pipelines/schedules.md                      |   2 +-
 doc/ci/pipelines/settings.md                       | 308 +++++++++++
 doc/ci/quick_start/README.md                       |   2 +-
 doc/ci/runners/README.md                           |   2 +-
 doc/ci/ssh_keys/README.md                          |   2 +-
 doc/ci/variables/README.md                         |  23 +-
 .../variables/img/new_custom_variables_example.png | Bin 68252 -> 0 bytes
 doc/ci/yaml/README.md                              |   6 +-
 doc/development/api_graphql_styleguide.md          |   8 +-
 doc/development/logging.md                         |  61 ++-
 doc/development/migration_style_guide.md           |  28 +-
 doc/subscriptions/index.md                         |   2 +-
 doc/topics/autodevops/index.md                     |   2 +-
 .../admin_area/settings/continuous_integration.md  |   4 +-
 .../application_security/configuration/index.md    |   2 +-
 doc/user/permissions.md                            |   2 +-
 doc/user/project/badges.md                         |   4 +-
 doc/user/project/clusters/index.md                 |   2 +-
 doc/user/project/import/gemnasium.md               |   2 +-
 doc/user/project/index.md                          |  10 +-
 doc/user/project/merge_requests/code_quality.md    |   2 +-
 doc/user/project/merge_requests/index.md           |   4 +-
 .../reviewing_and_managing_merge_requests.md       |   2 +-
 .../pipelines/img/pipelines_settings_badges.png    | Bin 21137 -> 0 bytes
 .../img/pipelines_settings_test_coverage.png       | Bin 2549 -> 0 bytes
 .../img/pipelines_test_coverage_build.png          | Bin 4481 -> 0 bytes
 .../img/pipelines_test_coverage_mr_widget.png      | Bin 6375 -> 0 bytes
 doc/user/project/pipelines/job_artifacts.md        |   2 +-
 doc/user/project/pipelines/settings.md             | 307 +----------
 doc/user/project/protected_branches.md             |   2 +-
 .../user_mentions/models/epic.rb                   |   1 +
 lib/gitlab/import_export/fast_hash_serializer.rb   |   6 +
 locale/gitlab.pot                                  |  64 ++-
 .../cop/migration/with_lock_retries_with_change.rb |  30 ++
 spec/db/schema_spec.rb                             |   1 +
 .../merge_request/user_sees_merge_widget_spec.rb   |  22 +-
 .../components/ci_variable_modal_spec.js           |  18 +-
 .../components/ci_variable_popover_spec.js         |  48 ++
 .../components/ci_variable_table_spec.js           |   7 +-
 .../ci_variable_list/services/mock_data.js         |  27 +-
 .../ci_variable_list/store/mutations_spec.js       |   4 +-
 spec/frontend/ci_variable_list/store/utils_spec.js |   2 +
 spec/frontend/contributors/store/getters_spec.js   |  32 +-
 spec/frontend/reports/store/utils_spec.js          |  34 +-
 spec/frontend/sidebar/mock_data.js                 |   2 +-
 .../components/grouped_test_reports_app_spec.js    |  20 +-
 spec/lib/gitlab/git/repository_spec.rb             |   4 +-
 .../import_export/fast_hash_serializer_spec.rb     |  10 +
 spec/models/concerns/ci/has_ref_spec.rb            |  79 +++
 spec/models/concerns/has_ref_spec.rb               |  79 ---
 spec/requests/api/pipelines_spec.rb                |   4 +-
 .../with_lock_retries_with_change_spec.rb          |  43 ++
 spec/serializers/group_variable_entity_spec.rb     |   2 +-
 spec/support/matchers/exceed_query_limit.rb        |  10 +-
 .../matchers/exceed_query_limit_helpers_spec.rb    |  34 ++
 131 files changed, 1857 insertions(+), 1388 deletions(-)
 create mode 100644 app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
 create mode 100644 app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql
 create mode 100644 app/models/concerns/ci/has_ref.rb
 delete mode 100644 app/models/concerns/has_ref.rb
 create mode 100644 changelogs/unreleased/32046-differentiate-between-errors-failures-in-xunit-result.yml
 create mode 100644 changelogs/unreleased/georgekoltsov-fix-relations-order-on-export.yml
 create mode 100644 changelogs/unreleased/open-project-integration-2.yml
 create mode 100644 changelogs/unreleased/repository-contributors-group-by-email.yml
 create mode 100644 db/migrate/20200309162244_add_open_project_tracker_data.rb
 delete mode 100644 db/post_migrate/20200214173000_cleanup_empty_epic_user_mentions.rb
 delete mode 100644 db/post_migrate/20200214174519_remigrate_epic_mentions_to_db.rb
 delete mode 100644 db/post_migrate/20200214174607_remigrate_epic_notes_mentions_to_db.rb
 delete mode 100644 doc/ci/img/collapsible_log_v12_6.png
 delete mode 100644 doc/ci/img/job_failure_reason.png
 delete mode 100644 doc/ci/img/manual_job_variables.png
 delete mode 100644 doc/ci/img/pipeline-delete.png
 delete mode 100644 doc/ci/img/pipeline_incremental_rollout.png
 delete mode 100644 doc/ci/img/pipelines.png
 delete mode 100644 doc/ci/img/pipelines_duration_chart.png
 delete mode 100644 doc/ci/img/pipelines_grouped.png
 delete mode 100644 doc/ci/img/pipelines_index.png
 delete mode 100644 doc/ci/img/pipelines_mini_graph.png
 delete mode 100644 doc/ci/img/pipelines_mini_graph_simple.png
 delete mode 100644 doc/ci/img/pipelines_mini_graph_sorting.png
 delete mode 100644 doc/ci/img/pipelines_success_chart.png
 create mode 100644 doc/ci/pipelines/img/collapsible_log_v12_6.png
 create mode 100644 doc/ci/pipelines/img/job_failure_reason.png
 create mode 100644 doc/ci/pipelines/img/manual_job_variables.png
 create mode 100644 doc/ci/pipelines/img/pipeline-delete.png
 create mode 100644 doc/ci/pipelines/img/pipeline_incremental_rollout.png
 create mode 100644 doc/ci/pipelines/img/pipelines.png
 create mode 100644 doc/ci/pipelines/img/pipelines_duration_chart.png
 create mode 100644 doc/ci/pipelines/img/pipelines_grouped.png
 create mode 100644 doc/ci/pipelines/img/pipelines_index.png
 create mode 100644 doc/ci/pipelines/img/pipelines_mini_graph.png
 create mode 100644 doc/ci/pipelines/img/pipelines_mini_graph_simple.png
 create mode 100644 doc/ci/pipelines/img/pipelines_mini_graph_sorting.png
 create mode 100644 doc/ci/pipelines/img/pipelines_settings_badges.png
 create mode 100644 doc/ci/pipelines/img/pipelines_settings_test_coverage.png
 create mode 100644 doc/ci/pipelines/img/pipelines_success_chart.png
 create mode 100644 doc/ci/pipelines/img/pipelines_test_coverage_build.png
 create mode 100644 doc/ci/pipelines/img/pipelines_test_coverage_mr_widget.png
 create mode 100644 doc/ci/pipelines/index.md
 create mode 100644 doc/ci/pipelines/settings.md
 delete mode 100644 doc/ci/variables/img/new_custom_variables_example.png
 delete mode 100644 doc/user/project/pipelines/img/pipelines_settings_badges.png
 delete mode 100644 doc/user/project/pipelines/img/pipelines_settings_test_coverage.png
 delete mode 100644 doc/user/project/pipelines/img/pipelines_test_coverage_build.png
 delete mode 100644 doc/user/project/pipelines/img/pipelines_test_coverage_mr_widget.png
 create mode 100644 rubocop/cop/migration/with_lock_retries_with_change.rb
 create mode 100644 spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
 create mode 100644 spec/models/concerns/ci/has_ref_spec.rb
 delete mode 100644 spec/models/concerns/has_ref_spec.rb
 create mode 100644 spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb
 create mode 100644 spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb

diff --git a/app/assets/javascripts/boards/mixins/sortable_default_options.js b/app/assets/javascripts/boards/mixins/sortable_default_options.js
index f77f131c71a..68ea28e68d9 100644
--- a/app/assets/javascripts/boards/mixins/sortable_default_options.js
+++ b/app/assets/javascripts/boards/mixins/sortable_default_options.js
@@ -26,7 +26,6 @@ export function getBoardSortableDefaultOptions(obj) {
     scrollSpeed: 20,
     onStart: sortableStart,
     onEnd: sortableEnd,
-    fallbackTolerance: 1,
   });
 
   Object.keys(obj).forEach(key => {
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
index 3e58fc40755..637f0237b63 100644
--- a/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
+++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_modal.vue
@@ -7,6 +7,7 @@ import {
   GlFormSelect,
   GlFormGroup,
   GlFormInput,
+  GlFormTextarea,
   GlFormCheckbox,
   GlLink,
   GlIcon,
@@ -19,6 +20,7 @@ export default {
     GlFormSelect,
     GlFormGroup,
     GlFormInput,
+    GlFormTextarea,
     GlFormCheckbox,
     GlLink,
     GlIcon,
@@ -34,17 +36,29 @@ export default {
       'maskableRegex',
     ]),
     canSubmit() {
+      if (this.variableData.masked && this.maskedState === false) {
+        return false;
+      }
       return this.variableData.key !== '' && this.variableData.secret_value !== '';
     },
     canMask() {
       const regex = RegExp(this.maskableRegex);
       return regex.test(this.variableData.secret_value);
     },
+    displayMaskedError() {
+      return !this.canMask && this.variableData.masked && this.variableData.secret_value !== '';
+    },
+    maskedState() {
+      if (this.displayMaskedError) {
+        return false;
+      }
+      return null;
+    },
     variableData() {
       return this.variableBeingEdited || this.variable;
     },
     modalActionText() {
-      return this.variableBeingEdited ? __('Update Variable') : __('Add variable');
+      return this.variableBeingEdited ? __('Update variable') : __('Add variable');
     },
     primaryAction() {
       return {
@@ -52,11 +66,23 @@ export default {
         attributes: { variant: 'success', disabled: !this.canSubmit },
       };
     },
+    deleteAction() {
+      if (this.variableBeingEdited) {
+        return {
+          text: __('Delete variable'),
+          attributes: { variant: 'danger', category: 'secondary' },
+        };
+      }
+      return null;
+    },
     cancelAction() {
       return {
         text: __('Cancel'),
       };
     },
+    maskedFeedback() {
+      return __('This variable can not be masked');
+    },
   },
   methods: {
     ...mapActions([
@@ -65,6 +91,7 @@ export default {
       'resetEditing',
       'displayInputValue',
       'clearModal',
+      'deleteVariable',
     ]),
     updateOrAddVariable() {
       if (this.variableBeingEdited) {
@@ -89,74 +116,93 @@ export default {
     :modal-id="$options.modalId"
     :title="modalActionText"
     :action-primary="primaryAction"
+    :action-secondary="deleteAction"
     :action-cancel="cancelAction"
     @ok="updateOrAddVariable"
     @hidden="resetModalHandler"
+    @secondary="deleteVariable(variableBeingEdited)"
   >
     <form>
-      <gl-form-group label="Type" label-for="ci-variable-type">
-        <gl-form-select
-          id="ci-variable-type"
-          v-model="variableData.variable_type"
-          :options="typeOptions"
+      <gl-form-group :label="__('Key')" label-for="ci-variable-key">
+        <gl-form-input
+          id="ci-variable-key"
+          v-model="variableData.key"
+          data-qa-selector="variable_key"
+        />
+      </gl-form-group>
+
+      <gl-form-group
+        :label="__('Value')"
+        label-for="ci-variable-value"
+        :state="maskedState"
+        :invalid-feedback="maskedFeedback"
+      >
+        <gl-form-textarea
+          id="ci-variable-value"
+          v-model="variableData.secret_value"
+          rows="3"
+          max-rows="6"
+          data-qa-selector="variable_value"
         />
       </gl-form-group>
 
       <div class="d-flex">
-        <gl-form-group label="Key" label-for="ci-variable-key" class="w-50 append-right-15">
-          <gl-form-input
-            id="ci-variable-key"
-            v-model="variableData.key"
-            type="text"
-            data-qa-selector="variable_key"
+        <gl-form-group
+          :label="__('Type')"
+          label-for="ci-variable-type"
+          class="w-50 append-right-15"
+          :class="{ 'w-100': isGroup }"
+        >
+          <gl-form-select
+            id="ci-variable-type"
+            v-model="variableData.variable_type"
+            :options="typeOptions"
           />
         </gl-form-group>
 
-        <gl-form-group label="Value" label-for="ci-variable-value" class="w-50">
-          <gl-form-input
-            id="ci-variable-value"
-            v-model="variableData.secret_value"
-            type="text"
-            data-qa-selector="variable_value"
+        <gl-form-group
+          v-if="!isGroup"
+          :label="__('Environment scope')"
+          label-for="ci-variable-env"
+          class="w-50"
+        >
+          <gl-form-select
+            id="ci-variable-env"
+            v-model="variableData.environment_scope"
+            :options="environments"
           />
         </gl-form-group>
       </div>
 
-      <gl-form-group v-if="!isGroup" label="Environment scope" label-for="ci-variable-env">
-        <gl-form-select
-          id="ci-variable-env"
-          v-model="variableData.environment_scope"
-          :options="environments"
-        />
-      </gl-form-group>
-
-      <gl-form-group label="Flags" label-for="ci-variable-flags">
+      <gl-form-group :label="__('Flags')" label-for="ci-variable-flags">
         <gl-form-checkbox v-model="variableData.protected" class="mb-0">
           {{ __('Protect variable') }}
           <gl-link href="/help/ci/variables/README#protected-environment-variables">
             <gl-icon name="question" :size="12" />
           </gl-link>
-          <p class="prepend-top-4 clgray">
-            {{ __('Allow variables to run on protected branches and tags.') }}
+          <p class="prepend-top-4 text-secondary">
+            {{ __('Export variable to pipelines running on protected branches and tags only.') }}
           </p>
         </gl-form-checkbox>
 
         <gl-form-checkbox
           ref="masked-ci-variable"
           v-model="variableData.masked"
-          :disabled="!canMask"
           data-qa-selector="variable_masked"
         >
           {{ __('Mask variable') }}
           <gl-link href="/help/ci/variables/README#masked-variables">
             <gl-icon name="question" :size="12" />
           </gl-link>
-          <p class="prepend-top-4 append-bottom-0 clgray">
-            {{
-              __(
-                'Variables will be masked in job logs. Requires values to meet regular expression requirements.',
-              )
-            }}
+          <p class="prepend-top-4 append-bottom-0 text-secondary">
+            {{ __('Variable will be masked in job logs.') }}
+            <span
+              :class="{
+                'bold text-plain': displayMaskedError,
+              }"
+            >
+              {{ __('Requires values to meet regular expression requirements.') }}</span
+            >
             <gl-link href="/help/ci/variables/README#masked-variables">{{
               __('More information')
             }}</gl-link>
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
new file mode 100644
index 00000000000..c4b1bc18f5a
--- /dev/null
+++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_popover.vue
@@ -0,0 +1,55 @@
+<script>
+import { GlPopover, GlIcon, GlButton, GlTooltipDirective } from '@gitlab/ui';
+
+export default {
+  maxTextLength: 95,
+  components: {
+    GlPopover,
+    GlIcon,
+    GlButton,
+  },
+  directives: {
+    GlTooltip: GlTooltipDirective,
+  },
+  props: {
+    target: {
+      type: String,
+      required: true,
+    },
+    value: {
+      type: String,
+      required: true,
+    },
+    tooltipText: {
+      type: String,
+      required: true,
+    },
+  },
+  computed: {
+    displayValue() {
+      if (this.value.length > this.$options.maxTextLength) {
+        return `${this.value.substring(0, this.$options.maxTextLength)}...`;
+      }
+      return this.value;
+    },
+  },
+};
+</script>
+
+<template>
+  <div id="popover-container">
+    <gl-popover :target="target" triggers="hover" placement="top" container="popover-container">
+      <div class="d-flex justify-content-between position-relative">
+        <div class="pr-5 w-100 ci-popover-value">{{ displayValue }}</div>
+        <gl-button
+          v-gl-tooltip
+          class="btn-transparent btn-clipboard position-absolute position-top-0 position-right-0"
+          :title="tooltipText"
+          :data-clipboard-text="value"
+        >
+          <gl-icon name="copy-to-clipboard" />
+        </gl-button>
+      </div>
+    </gl-popover>
+  </div>
+</template>
diff --git a/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue b/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue
index e240323d2c5..3f2f89ada6f 100644
--- a/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue
+++ b/app/assets/javascripts/ci_variable_list/components/ci_variable_table.vue
@@ -3,44 +3,58 @@ import { GlTable, GlButton, GlModalDirective, GlIcon } from '@gitlab/ui';
 import { s__, __ } from '~/locale';
 import { mapState, mapActions } from 'vuex';
 import { ADD_CI_VARIABLE_MODAL_ID } from '../constants';
+import CiVariablePopover from './ci_variable_popover.vue';
 
 export default {
   modalId: ADD_CI_VARIABLE_MODAL_ID,
+  trueIcon: 'mobile-issue-close',
+  falseIcon: 'close',
+  iconSize: 16,
   fields: [
     {
       key: 'variable_type',
       label: s__('CiVariables|Type'),
+      customStyle: { width: '70px' },
     },
     {
       key: 'key',
       label: s__('CiVariables|Key'),
+      tdClass: 'text-plain',
+      sortable: true,
+      customStyle: { width: '40%' },
     },
     {
       key: 'value',
       label: s__('CiVariables|Value'),
       tdClass: 'qa-ci-variable-input-value',
+      customStyle: { width: '40%' },
     },
     {
       key: 'protected',
       label: s__('CiVariables|Protected'),
+      customStyle: { width: '100px' },
     },
     {
       key: 'masked',
       label: s__('CiVariables|Masked'),
+      customStyle: { width: '100px' },
     },
     {
       key: 'environment_scope',
-      label: s__('CiVariables|Environment Scope'),
+      label: s__('CiVariables|Environments'),
+      customStyle: { width: '20%' },
     },
     {
       key: 'actions',
       label: '',
+      customStyle: { width: '35px' },
     },
   ],
   components: {
     GlTable,
     GlButton,
     GlIcon,
+    CiVariablePopover,
   },
   directives: {
     GlModalDirective,
@@ -64,7 +78,7 @@ export default {
     this.fetchVariables();
   },
   methods: {
-    ...mapActions(['fetchVariables', 'deleteVariable', 'toggleValues', 'editVariable']),
+    ...mapActions(['fetchVariables', 'toggleValues', 'editVariable']),
   },
 };
 </script>
@@ -74,42 +88,82 @@ export default {
     <gl-table
       :fields="fields"
       :items="variables"
-      responsive
-      show-empty
       tbody-tr-class="js-ci-variable-row"
+      sort-by="key"
+      sort-direction="asc"
+      stacked="lg"
+      fixed
+      show-empty
+      sort-icon-left
+      no-sort-reset
     >
-      <template #cell(value)="data">
-        <span v-if="valuesHidden">*****************</span>
-        <span v-else>{{ data.value }}</span>
+      <template #table-colgroup="scope">
+        <col v-for="field in scope.fields" :key="field.key" :style="field.customStyle" />
+      </template>
+      <template #cell(key)="{ item }">
+        <div class="d-flex truncated-container">
+          <span :id="`ci-variable-key-${item.id}`" class="d-inline-block mw-100 text-truncate">{{
+            item.key
+          }}</span>
+          <ci-variable-popover
+            :target="`ci-variable-key-${item.id}`"
+            :value="item.key"
+            :tooltip-text="__('Copy key')"
+          />
+        </div>
+      </template>
+      <template #cell(value)="{ item }">
+        <span v-if="valuesHidden">*********************</span>
+        <div v-else class="d-flex truncated-container">
+          <span :id="`ci-variable-value-${item.id}`" class="d-inline-block mw-100 text-truncate">{{
+            item.value
+          }}</span>
+          <ci-variable-popover
+            :target="`ci-variable-value-${item.id}`"
+            :value="item.value"
+            :tooltip-text="__('Copy value')"
+          />
+        </div>
+      </template>
+      <template #cell(protected)="{ item }">
+        <gl-icon v-if="item.protected" :size="$options.iconSize" :name="$options.trueIcon" />
+        <gl-icon v-else :size="$options.iconSize" :name="$options.falseIcon" />
+      </template>
+      <template #cell(masked)="{ item }">
+        <gl-icon v-if="item.masked" :size="$options.iconSize" :name="$options.trueIcon" />
+        <gl-icon v-else :size="$options.iconSize" :name="$options.falseIcon" />
       </template>
-      <template #cell(actions)="data">
+      <template #cell(environment_scope)="{ item }">
+        <div class="d-flex truncated-container">
+          <span :id="`ci-variable-env-${item.id}`" class="d-inline-block mw-100 text-truncate">{{
+            item.environment_scope
+          }}</span>
+          <ci-variable-popover
+            :target="`ci-variable-env-${item.id}`"
+            :value="item.environment_scope"
+            :tooltip-text="__('Copy environment')"
+          />
+        </div>
+      </template>
+      <template #cell(actions)="{ item }">
         <gl-button
           ref="edit-ci-variable"
           v-gl-modal-directive="$options.modalId"
-          @click="editVariable(data.item)"
+          @click="editVariable(item)"
         >
-          <gl-icon name="pencil" />
-        </gl-button>
-        <gl-button
-          ref="delete-ci-variable"
-          category="secondary"
-          variant="danger"
-          @click="deleteVariable(data.item)"
-        >
-          <gl-icon name="remove" />
+          <gl-icon :size="$options.iconSize" name="pencil" />
         </gl-button>
       </template>
       <template #empty>
-        <p ref="empty-variables" class="settings-message text-center empty-variables">
-          {{
-            __(
-              'There are currently no variables, add a variable with the Add Variable button below.',
-            )
-          }}
+        <p ref="empty-variables" class="text-center empty-variables text-plain">
+          {{ __('There are no variables yet.') }}
         </p>
       </template>
     </gl-table>
-    <div class="ci-variable-actions d-flex justify-content-end">
+    <div
+      class="ci-variable-actions d-flex justify-content-end"
+      :class="{ 'justify-content-center': !tableIsNotEmpty }"
+    >
       <gl-button
         v-if="tableIsNotEmpty"
         ref="secret-value-reveal-button"
diff --git a/app/assets/javascripts/ci_variable_list/constants.js b/app/assets/javascripts/ci_variable_list/constants.js
index bfc9cbbd840..b2fa980c546 100644
--- a/app/assets/javascripts/ci_variable_list/constants.js
+++ b/app/assets/javascripts/ci_variable_list/constants.js
@@ -1,2 +1,16 @@
-// eslint-disable-next-line import/prefer-default-export
+import { __ } from '~/locale';
+
+// eslint-disable import/prefer-default-export
 export const ADD_CI_VARIABLE_MODAL_ID = 'add-ci-variable';
+
+export const displayText = {
+  variableText: __('Var'),
+  fileText: __('File'),
+  allEnvironmentsText: __('All'),
+};
+
+export const types = {
+  variableType: 'env_var',
+  fileType: 'file',
+  allEnvironmentsType: '*',
+};
diff --git a/app/assets/javascripts/ci_variable_list/store/mutations.js b/app/assets/javascripts/ci_variable_list/store/mutations.js
index 74e2bcfa2db..c75eb4a91fd 100644
--- a/app/assets/javascripts/ci_variable_list/store/mutations.js
+++ b/app/assets/javascripts/ci_variable_list/store/mutations.js
@@ -1,5 +1,5 @@
 import * as types from './mutation_types';
-import { __ } from '~/locale';
+import { displayText } from '../constants';
 
 export default {
   [types.REQUEST_VARIABLES](state) {
@@ -61,7 +61,7 @@ export default {
   [types.RECEIVE_ENVIRONMENTS_SUCCESS](state, environments) {
     state.isLoading = false;
     state.environments = environments;
-    state.environments.unshift(__('All environments'));
+    state.environments.unshift(displayText.allEnvironmentsText);
   },
 
   [types.VARIABLE_BEING_EDITED](state, variable) {
@@ -70,12 +70,12 @@ export default {
 
   [types.CLEAR_MODAL](state) {
     state.variable = {
-      variable_type: __('Variable'),
+      variable_type: displayText.variableText,
       key: '',
       secret_value: '',
       protected: false,
       masked: false,
-      environment_scope: __('All environments'),
+      environment_scope: displayText.allEnvironmentsText,
     };
   },
 
diff --git a/app/assets/javascripts/ci_variable_list/store/state.js b/app/assets/javascripts/ci_variable_list/store/state.js
index c5e0bbfdbf4..5166321d6a7 100644
--- a/app/assets/javascripts/ci_variable_list/store/state.js
+++ b/app/assets/javascripts/ci_variable_list/store/state.js
@@ -1,4 +1,4 @@
-import { __ } from '~/locale';
+import { displayText } from '../constants';
 
 export default () => ({
   endpoint: null,
@@ -8,17 +8,17 @@ export default () => ({
   isLoading: false,
   isDeleting: false,
   variable: {
-    variable_type: __('Variable'),
+    variable_type: displayText.variableText,
     key: '',
     secret_value: '',
     protected: false,
     masked: false,
-    environment_scope: __('All environments'),
+    environment_scope: displayText.allEnvironmentsText,
   },
   variables: null,
   valuesHidden: true,
   error: null,
   environments: [],
-  typeOptions: [__('Variable'), __('File')],
+  typeOptions: [displayText.variableText, displayText.fileText],
   variableBeingEdited: null,
 });
diff --git a/app/assets/javascripts/ci_variable_list/store/utils.js b/app/assets/javascripts/ci_variable_list/store/utils.js
index 0b9932d9bb5..3cd8c85024b 100644
--- a/app/assets/javascripts/ci_variable_list/store/utils.js
+++ b/app/assets/javascripts/ci_variable_list/store/utils.js
@@ -1,23 +1,22 @@
-import { __ } from '~/locale';
 import { cloneDeep } from 'lodash';
+import { displayText, types } from '../constants';
 
-const variableType = 'env_var';
-const fileType = 'file';
-
-const variableTypeHandler = type => (type === 'Variable' ? variableType : fileType);
+const variableTypeHandler = type =>
+  type === displayText.variableText ? types.variableType : types.fileType;
 
 export const prepareDataForDisplay = variables => {
   const variablesToDisplay = [];
   variables.forEach(variable => {
     const variableCopy = variable;
-    if (variableCopy.variable_type === variableType) {
-      variableCopy.variable_type = __('Variable');
+    if (variableCopy.variable_type === types.variableType) {
+      variableCopy.variable_type = displayText.variableText;
     } else {
-      variableCopy.variable_type = __('File');
+      variableCopy.variable_type = displayText.fileText;
     }
+    variableCopy.secret_value = variableCopy.value;
 
-    if (variableCopy.environment_scope === '*') {
-      variableCopy.environment_scope = __('All environments');
+    if (variableCopy.environment_scope === types.allEnvironmentsType) {
+      variableCopy.environment_scope = displayText.allEnvironmentsText;
     }
     variablesToDisplay.push(variableCopy);
   });
@@ -29,9 +28,8 @@ export const prepareDataForApi = (variable, destroy = false) => {
   variableCopy.protected = variableCopy.protected.toString();
   variableCopy.masked = variableCopy.masked.toString();
   variableCopy.variable_type = variableTypeHandler(variableCopy.variable_type);
-
-  if (variableCopy.environment_scope === __('All environments')) {
-    variableCopy.environment_scope = __('*');
+  if (variableCopy.environment_scope === displayText.allEnvironmentsText) {
+    variableCopy.environment_scope = types.allEnvironmentsType;
   }
 
   if (destroy) {
diff --git a/app/assets/javascripts/contributors/components/contributors.vue b/app/assets/javascripts/contributors/components/contributors.vue
index 8dbf0a68c43..19516a13d15 100644
--- a/app/assets/javascripts/contributors/components/contributors.vue
+++ b/app/assets/javascripts/contributors/components/contributors.vue
@@ -66,12 +66,12 @@ export default {
     individualChartsData() {
       const maxNumberOfIndividualContributorsCharts = 100;
 
-      return Object.keys(this.parsedData.byAuthor)
-        .map(name => {
-          const author = this.parsedData.byAuthor[name];
+      return Object.keys(this.parsedData.byAuthorEmail)
+        .map(email => {
+          const author = this.parsedData.byAuthorEmail[email];
           return {
-            name,
-            email: author.email,
+            name: author.name,
+            email,
             commits: author.commits,
             dates: [
               {
diff --git a/app/assets/javascripts/contributors/stores/getters.js b/app/assets/javascripts/contributors/stores/getters.js
index 9e02e3ed9e7..9b0def9b3ca 100644
--- a/app/assets/javascripts/contributors/stores/getters.js
+++ b/app/assets/javascripts/contributors/stores/getters.js
@@ -1,17 +1,17 @@
 export const showChart = state => Boolean(!state.loading && state.chartData);
 
 export const parsedData = state => {
-  const byAuthor = {};
+  const byAuthorEmail = {};
   const total = {};
 
   state.chartData.forEach(({ date, author_name, author_email }) => {
     total[date] = total[date] ? total[date] + 1 : 1;
 
-    const authorData = byAuthor[author_name];
+    const authorData = byAuthorEmail[author_email];
 
     if (!authorData) {
-      byAuthor[author_name] = {
-        email: author_email.toLowerCase(),
+      byAuthorEmail[author_email] = {
+        name: author_name,
         commits: 1,
         dates: {
           [date]: 1,
@@ -25,7 +25,7 @@ export const parsedData = state => {
 
   return {
     total,
-    byAuthor,
+    byAuthorEmail,
   };
 };
 
diff --git a/app/assets/javascripts/reports/store/utils.js b/app/assets/javascripts/reports/store/utils.js
index ce3ffaae703..5d3d9ddda3b 100644
--- a/app/assets/javascripts/reports/store/utils.js
+++ b/app/assets/javascripts/reports/store/utils.js
@@ -11,9 +11,10 @@ const textBuilder = results => {
   const { failed, errored, resolved, total } = results;
 
   const failedOrErrored = (failed || 0) + (errored || 0);
-  const failedString = failedOrErrored
-    ? n__('%d failed/error test result', '%d failed/error test results', failedOrErrored)
-    : null;
+  const failedString = failed ? n__('%d failed', '%d failed', failed) : null;
+  const erroredString = errored ? n__('%d error', '%d errors', errored) : null;
+  const combinedString =
+    failed && errored ? `${failedString}, ${erroredString}` : failedString || erroredString;
   const resolvedString = resolved
     ? n__('%d fixed test result', '%d fixed test results', resolved)
     : null;
@@ -23,12 +24,12 @@ const textBuilder = results => {
 
   if (failedOrErrored) {
     if (resolved) {
-      resultsString = sprintf(s__('Reports|%{failedString} and %{resolvedString}'), {
-        failedString,
+      resultsString = sprintf(s__('Reports|%{combinedString} and %{resolvedString}'), {
+        combinedString,
         resolvedString,
       });
     } else {
-      resultsString = failedString;
+      resultsString = combinedString;
     }
   } else if (resolved) {
     resultsString = resolvedString;
diff --git a/app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql b/app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql
new file mode 100644
index 00000000000..27a5cff12c7
--- /dev/null
+++ b/app/assets/javascripts/sidebar/queries/updateStatus.mutation.graphql
@@ -0,0 +1,7 @@
+mutation ($projectPath: ID!, $iid: String!, $healthStatus: HealthStatus) {
+  updateIssue(input: { projectPath: $projectPath, iid: $iid, healthStatus: $healthStatus}) {
+    issue {
+      healthStatus
+    }
+  }
+}
diff --git a/app/assets/javascripts/sidebar/services/sidebar_service.js b/app/assets/javascripts/sidebar/services/sidebar_service.js
index 59d4f6ed388..3b8903b4a4c 100644
--- a/app/assets/javascripts/sidebar/services/sidebar_service.js
+++ b/app/assets/javascripts/sidebar/services/sidebar_service.js
@@ -18,7 +18,7 @@ export default class SidebarService {
       this.moveIssueEndpoint = endpointMap.moveIssueEndpoint;
       this.projectsAutocompleteEndpoint = endpointMap.projectsAutocompleteEndpoint;
       this.fullPath = endpointMap.fullPath;
-      this.id = endpointMap.id;
+      this.iid = endpointMap.iid;
 
       SidebarService.singleton = this;
     }
@@ -37,7 +37,7 @@ export default class SidebarService {
           : sidebarDetailsQuery,
         variables: {
           fullPath: this.fullPath,
-          iid: this.id.toString(),
+          iid: this.iid.toString(),
         },
       }),
     ]);
@@ -47,6 +47,17 @@ export default class SidebarService {
     return axios.put(this.endpoint, { [key]: data });
   }
 
+  updateWithGraphQl(mutation, variables) {
+    return gqClient.mutate({
+      mutation,
+      variables: {
+        ...variables,
+        projectPath: this.fullPath,
+        iid: this.iid.toString(),
+      },
+    });
+  }
+
   getProjectsAutocomplete(searchTerm) {
     return axios.get(this.projectsAutocompleteEndpoint, {
       params: {
diff --git a/app/assets/javascripts/sidebar/sidebar_mediator.js b/app/assets/javascripts/sidebar/sidebar_mediator.js
index eb1cf977725..34621fc1036 100644
--- a/app/assets/javascripts/sidebar/sidebar_mediator.js
+++ b/app/assets/javascripts/sidebar/sidebar_mediator.js
@@ -20,7 +20,7 @@ export default class SidebarMediator {
       moveIssueEndpoint: options.moveIssueEndpoint,
       projectsAutocompleteEndpoint: options.projectsAutocompleteEndpoint,
       fullPath: options.fullPath,
-      id: options.id,
+      iid: options.iid,
     });
     SidebarMediator.singleton = this;
   }
diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index 7294816aa26..c90b92a5b49 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -376,8 +376,29 @@
 }
 
 .ci-variable-table {
-  table tr th {
-    background-color: transparent;
-    border: 0;
+  table {
+    thead {
+      border-bottom: 1px solid $white-normal;
+    }
+
+    tr {
+      td,
+      th {
+        padding-left: 0;
+      }
+
+      th {
+        background-color: transparent;
+        font-weight: $gl-font-weight-bold;
+        border: 0;
+      }
+    }
+  }
+
+  @media(max-width: map-get($grid-breakpoints, lg)-1) {
+    .truncated-container {
+      justify-content: flex-end;
+    }
   }
 }
+
diff --git a/app/helpers/issuables_helper.rb b/app/helpers/issuables_helper.rb
index aa05076c43e..acfd972bb83 100644
--- a/app/helpers/issuables_helper.rb
+++ b/app/helpers/issuables_helper.rb
@@ -463,7 +463,7 @@ module IssuablesHelper
       currentUser: issuable[:current_user],
       rootPath: root_path,
       fullPath: issuable[:project_full_path],
-      id: issuable[:id],
+      iid: issuable[:iid],
       timeTrackingLimitToHours: Gitlab::CurrentSettings.time_tracking_limit_to_hours
     }
   end
diff --git a/app/models/ci/bridge.rb b/app/models/ci/bridge.rb
index 955b16ad50d..fa0619f35b0 100644
--- a/app/models/ci/bridge.rb
+++ b/app/models/ci/bridge.rb
@@ -7,7 +7,7 @@ module Ci
     include Ci::Metadatable
     include Importable
     include AfterCommitQueue
-    include HasRef
+    include Ci::HasRef
 
     InvalidBridgeTypeError = Class.new(StandardError)
     InvalidTransitionError = Class.new(StandardError)
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb
index fd099107fe7..4762740ee2f 100644
--- a/app/models/ci/build.rb
+++ b/app/models/ci/build.rb
@@ -10,7 +10,7 @@ module Ci
     include ObjectStorage::BackgroundMove
     include Presentable
     include Importable
-    include HasRef
+    include Ci::HasRef
     include IgnorableColumns
 
     BuildArchivedError = Class.new(StandardError)
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index bc0528bdbe0..d841601cf4b 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -11,7 +11,7 @@ module Ci
     include Gitlab::Utils::StrongMemoize
     include AtomicInternalId
     include EnumWithNil
-    include HasRef
+    include Ci::HasRef
     include ShaAttribute
     include FromUnion
     include UpdatedAtFilterable
diff --git a/app/models/concerns/ci/has_ref.rb b/app/models/concerns/ci/has_ref.rb
new file mode 100644
index 00000000000..cf57ff47743
--- /dev/null
+++ b/app/models/concerns/ci/has_ref.rb
@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+##
+# We will disable `ref` and `sha` attributes in `Ci::Build` in the future
+# and remove this module in favor of Ci::PipelineDelegator.
+module Ci
+  module HasRef
+    extend ActiveSupport::Concern
+
+    def branch?
+      !tag? && !merge_request?
+    end
+
+    def git_ref
+      if branch?
+        Gitlab::Git::BRANCH_REF_PREFIX + ref.to_s
+      elsif tag?
+        Gitlab::Git::TAG_REF_PREFIX + ref.to_s
+      end
+    end
+
+    # A slugified version of the build ref, suitable for inclusion in URLs and
+    # domain names. Rules:
+    #
+    #   * Lowercased
+    #   * Anything not matching [a-z0-9-] is replaced with a -
+    #   * Maximum length is 63 bytes
+    #   * First/Last Character is not a hyphen
+    def ref_slug
+      Gitlab::Utils.slugify(ref.to_s)
+    end
+  end
+end
diff --git a/app/models/concerns/has_ref.rb b/app/models/concerns/has_ref.rb
deleted file mode 100644
index 22e5955984d..00000000000
--- a/app/models/concerns/has_ref.rb
+++ /dev/null
@@ -1,31 +0,0 @@
-# frozen_string_literal: true
-
-##
-# We will disable `ref` and `sha` attributes in `Ci::Build` in the future
-# and remove this module in favor of Ci::PipelineDelegator.
-module HasRef
-  extend ActiveSupport::Concern
-
-  def branch?
-    !tag? && !merge_request?
-  end
-
-  def git_ref
-    if branch?
-      Gitlab::Git::BRANCH_REF_PREFIX + ref.to_s
-    elsif tag?
-      Gitlab::Git::TAG_REF_PREFIX + ref.to_s
-    end
-  end
-
-  # A slugified version of the build ref, suitable for inclusion in URLs and
-  # domain names. Rules:
-  #
-  #   * Lowercased
-  #   * Anything not matching [a-z0-9-] is replaced with a -
-  #   * Maximum length is 63 bytes
-  #   * First/Last Character is not a hyphen
-  def ref_slug
-    Gitlab::Utils.slugify(ref.to_s)
-  end
-end
diff --git a/app/serializers/group_variable_entity.rb b/app/serializers/group_variable_entity.rb
index 19c5fa26f34..622106458c3 100644
--- a/app/serializers/group_variable_entity.rb
+++ b/app/serializers/group_variable_entity.rb
@@ -4,6 +4,7 @@ class GroupVariableEntity < Grape::Entity
   expose :id
   expose :key
   expose :value
+  expose :variable_type
 
   expose :protected?, as: :protected
   expose :masked?, as: :masked
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml
index cb9f992bb1d..c7918881bdf 100644
--- a/app/views/admin/application_settings/_ci_cd.html.haml
+++ b/app/views/admin/application_settings/_ci_cd.html.haml
@@ -58,6 +58,6 @@
       = f.text_field :default_ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml'
       %p.form-text.text-muted
         = _("The default CI configuration path for new projects.").html_safe
-        = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-configuration-path'), target: '_blank'
+        = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'custom-ci-configuration-path'), target: '_blank'
 
   = f.submit _('Save changes'), class: "btn btn-success"
diff --git a/app/views/projects/settings/ci_cd/_form.html.haml b/app/views/projects/settings/ci_cd/_form.html.haml
index e6be364b48f..54e46501287 100644
--- a/app/views/projects/settings/ci_cd/_form.html.haml
+++ b/app/views/projects/settings/ci_cd/_form.html.haml
@@ -8,7 +8,7 @@
             = _("Git strategy for pipelines")
           %p
             = _("Choose between <code>clone</code> or <code>fetch</code> to get the recent application code").html_safe
-            = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'git-strategy'), target: '_blank'
+            = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'git-strategy'), target: '_blank'
           .form-check
             = f.radio_button :build_allow_git_fetch, 'false', { class: 'form-check-input' }
             = f.label :build_allow_git_fetch_false, class: 'form-check-label' do
@@ -38,7 +38,7 @@
           = f.text_field :build_timeout_human_readable, class: 'form-control'
           %p.form-text.text-muted
             = _('If any job surpasses this timeout threshold, it will be marked as failed. Human readable time input language is accepted like "1 hour". Values without specification represent seconds.')
-            = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'timeout'), target: '_blank'
+            = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'timeout'), target: '_blank'
 
         - if can?(current_user, :update_max_artifacts_size, @project)
           %hr
@@ -55,7 +55,7 @@
           = f.text_field :ci_config_path, class: 'form-control', placeholder: '.gitlab-ci.yml'
           %p.form-text.text-muted
             = _("The path to the CI configuration file. Defaults to <code>.gitlab-ci.yml</code>").html_safe
-            = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'custom-ci-configuration-path'), target: '_blank'
+            = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'custom-ci-configuration-path'), target: '_blank'
 
         %hr
         .form-group
@@ -65,7 +65,7 @@
               %strong= _("Public pipelines")
             .form-text.text-muted
               = _("Allow public access to pipelines and job details, including output logs and artifacts")
-              = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'visibility-of-pipelines'), target: '_blank'
+              = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'visibility-of-pipelines'), target: '_blank'
             .bs-callout.bs-callout-info
               %p #{_("If enabled")}:
               %ul
@@ -86,7 +86,7 @@
               %strong= _("Auto-cancel redundant, pending pipelines")
             .form-text.text-muted
               = _("New pipelines will cancel older, pending pipelines on the same branch")
-              = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'auto-cancel-pending-pipelines'), target: '_blank'
+              = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'auto-cancel-pending-pipelines'), target: '_blank'
 
         .form-group
           .form-check
@@ -95,7 +95,7 @@
               %strong= _("Skip older, pending deployment jobs")
             .form-text.text-muted
               = _("When a deployment job is successful, skip older deployment jobs that are still pending")
-              = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'skip-older-pending-deployment-jobs'), target: '_blank'
+              = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'skip-older-pending-deployment-jobs'), target: '_blank'
 
         %hr
         .form-group
@@ -108,7 +108,7 @@
               .input-group-text /
           %p.form-text.text-muted
             = _("A regular expression that will be used to find the test coverage output in the job log. Leave blank to disable")
-            = link_to icon('question-circle'), help_page_path('user/project/pipelines/settings', anchor: 'test-coverage-parsing'), target: '_blank'
+            = link_to icon('question-circle'), help_page_path('ci/pipelines/settings', anchor: 'test-coverage-parsing'), target: '_blank'
           .bs-callout.bs-callout-info
             %p= _("Below are examples of regex for existing tools:")
             %ul
diff --git a/changelogs/unreleased/32046-differentiate-between-errors-failures-in-xunit-result.yml b/changelogs/unreleased/32046-differentiate-between-errors-failures-in-xunit-result.yml
new file mode 100644
index 00000000000..632b673f2b9
--- /dev/null
+++ b/changelogs/unreleased/32046-differentiate-between-errors-failures-in-xunit-result.yml
@@ -0,0 +1,5 @@
+---
+title: Differentiate between errors and failures in xUnit result
+merge_request: 23476
+author:
+type: changed
diff --git a/changelogs/unreleased/georgekoltsov-fix-relations-order-on-export.yml b/changelogs/unreleased/georgekoltsov-fix-relations-order-on-export.yml
new file mode 100644
index 00000000000..bdcaf31877e
--- /dev/null
+++ b/changelogs/unreleased/georgekoltsov-fix-relations-order-on-export.yml
@@ -0,0 +1,5 @@
+---
+title: Reorder exported relations by primary_key when using Project Export
+merge_request: 27117
+author:
+type: fixed
diff --git a/changelogs/unreleased/open-project-integration-2.yml b/changelogs/unreleased/open-project-integration-2.yml
new file mode 100644
index 00000000000..4bb17b3e30a
--- /dev/null
+++ b/changelogs/unreleased/open-project-integration-2.yml
@@ -0,0 +1,5 @@
+---
+title: Add migration for creating open_project_tracker_data table
+merge_request: 26966
+author:
+type: other
diff --git a/changelogs/unreleased/repository-contributors-group-by-email.yml b/changelogs/unreleased/repository-contributors-group-by-email.yml
new file mode 100644
index 00000000000..7ee48907e6a
--- /dev/null
+++ b/changelogs/unreleased/repository-contributors-group-by-email.yml
@@ -0,0 +1,5 @@
+---
+title: Group repository contributors by email instead of name
+merge_request: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/26899
+author: Hilco van der Wilk
+type: changed
diff --git a/db/migrate/20200309162244_add_open_project_tracker_data.rb b/db/migrate/20200309162244_add_open_project_tracker_data.rb
new file mode 100644
index 00000000000..672dde4d518
--- /dev/null
+++ b/db/migrate/20200309162244_add_open_project_tracker_data.rb
@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+# See https://docs.gitlab.com/ee/development/migration_style_guide.html
+# for more information on how to write migrations for GitLab.
+
+class AddOpenProjectTrackerData < ActiveRecord::Migration[6.0]
+  DOWNTIME = false
+
+  def change
+    create_table :open_project_tracker_data do |t|
+      t.references :service, foreign_key: { on_delete: :cascade }, type: :integer, index: true, null: false
+      t.timestamps_with_timezone
+      t.string :encrypted_url, limit: 255
+      t.string :encrypted_url_iv, limit: 255
+      t.string :encrypted_api_url, limit: 255
+      t.string :encrypted_api_url_iv, limit: 255
+      t.string :encrypted_token, limit: 255
+      t.string :encrypted_token_iv, limit: 255
+      t.string :closed_status_id, limit: 5
+      t.string :project_identifier_code, limit: 100
+    end
+  end
+end
diff --git a/db/post_migrate/20191115115043_migrate_epic_mentions_to_db.rb b/db/post_migrate/20191115115043_migrate_epic_mentions_to_db.rb
index 2cbf7a69159..97f2e568a7e 100644
--- a/db/post_migrate/20191115115043_migrate_epic_mentions_to_db.rb
+++ b/db/post_migrate/20191115115043_migrate_epic_mentions_to_db.rb
@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 class MigrateEpicMentionsToDb < ActiveRecord::Migration[5.2]
-  include Gitlab::Database::MigrationHelpers
-
   DOWNTIME = false
 
   disable_ddl_transaction!
@@ -28,7 +26,7 @@ class MigrateEpicMentionsToDb < ActiveRecord::Migration[5.2]
       .where(QUERY_CONDITIONS)
       .each_batch(of: BATCH_SIZE) do |batch, index|
       range = batch.pluck(Arel.sql('MIN(epics.id)'), Arel.sql('MAX(epics.id)')).first
-      migrate_in(index * DELAY, MIGRATION, ['Epic', JOIN, QUERY_CONDITIONS, false, *range])
+      BackgroundMigrationWorker.perform_in(index * DELAY, MIGRATION, ['Epic', JOIN, QUERY_CONDITIONS, false, *range])
     end
   end
 
diff --git a/db/post_migrate/20200214173000_cleanup_empty_epic_user_mentions.rb b/db/post_migrate/20200214173000_cleanup_empty_epic_user_mentions.rb
deleted file mode 100644
index ef6486675e0..00000000000
--- a/db/post_migrate/20200214173000_cleanup_empty_epic_user_mentions.rb
+++ /dev/null
@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-class CleanupEmptyEpicUserMentions < ActiveRecord::Migration[5.2]
-  DOWNTIME = false
-  BATCH_SIZE = 10000
-
-  class EpicUserMention < ActiveRecord::Base
-    include EachBatch
-
-    self.table_name = 'epic_user_mentions'
-  end
-
-  def up
-    return unless Gitlab.ee?
-
-    # cleanup epic user mentions with no actual mentions,
-    # re https://gitlab.com/gitlab-org/gitlab/-/merge_requests/24586#note_285982468
-    EpicUserMention
-      .where(mentioned_users_ids: nil)
-      .where(mentioned_groups_ids: nil)
-      .where(mentioned_projects_ids: nil)
-      .each_batch(of: BATCH_SIZE) do |batch|
-      batch.delete_all
-    end
-  end
-
-  def down
-    # no-op
-  end
-end
diff --git a/db/post_migrate/20200214174519_remigrate_epic_mentions_to_db.rb b/db/post_migrate/20200214174519_remigrate_epic_mentions_to_db.rb
deleted file mode 100644
index 68fe031be5d..00000000000
--- a/db/post_migrate/20200214174519_remigrate_epic_mentions_to_db.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-class RemigrateEpicMentionsToDb < ActiveRecord::Migration[5.2]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  disable_ddl_transaction!
-
-  DELAY = 2.minutes.to_i
-  BATCH_SIZE = 10000
-  MIGRATION = 'UserMentions::CreateResourceUserMention'
-
-  JOIN = "LEFT JOIN epic_user_mentions on epics.id = epic_user_mentions.epic_id"
-  QUERY_CONDITIONS = "(description like '%@%' OR title like '%@%') AND epic_user_mentions.epic_id is null"
-
-  class Epic < ActiveRecord::Base
-    include EachBatch
-
-    self.table_name = 'epics'
-  end
-
-  def up
-    return unless Gitlab.ee?
-
-    Epic
-      .joins(JOIN)
-      .where(QUERY_CONDITIONS)
-      .each_batch(of: BATCH_SIZE) do |batch, index|
-      range = batch.pluck(Arel.sql('MIN(epics.id)'), Arel.sql('MAX(epics.id)')).first
-      migrate_in(index * DELAY, MIGRATION, ['Epic', JOIN, QUERY_CONDITIONS, false, *range])
-    end
-  end
-
-  def down
-    # no-op
-  end
-end
diff --git a/db/post_migrate/20200214174607_remigrate_epic_notes_mentions_to_db.rb b/db/post_migrate/20200214174607_remigrate_epic_notes_mentions_to_db.rb
deleted file mode 100644
index cb442233229..00000000000
--- a/db/post_migrate/20200214174607_remigrate_epic_notes_mentions_to_db.rb
+++ /dev/null
@@ -1,45 +0,0 @@
-# frozen_string_literal: true
-
-class RemigrateEpicNotesMentionsToDb < ActiveRecord::Migration[5.2]
-  include Gitlab::Database::MigrationHelpers
-
-  DOWNTIME = false
-
-  disable_ddl_transaction!
-
-  DELAY = 2.minutes.to_i
-  BATCH_SIZE = 10000
-  MIGRATION = 'UserMentions::CreateResourceUserMention'
-
-  INDEX_NAME = 'epic_mentions_temp_index'
-  INDEX_CONDITION = "note LIKE '%@%'::text AND notes.noteable_type = 'Epic'"
-  QUERY_CONDITIONS = "#{INDEX_CONDITION} AND epic_user_mentions.epic_id IS NULL"
-  JOIN = 'INNER JOIN epics ON epics.id = notes.noteable_id LEFT JOIN epic_user_mentions ON notes.id = epic_user_mentions.note_id'
-
-  class Note < ActiveRecord::Base
-    include EachBatch
-
-    self.table_name = 'notes'
-  end
-
-  def up
-    return unless Gitlab.ee?
-
-    # create temporary index for notes with mentions, may take well over 1h
-    add_concurrent_index(:notes, :id, where: INDEX_CONDITION, name: INDEX_NAME)
-
-    Note
-      .joins(JOIN)
-      .where(QUERY_CONDITIONS)
-      .each_batch(of: BATCH_SIZE) do |batch, index|
-      range = batch.pluck(Arel.sql('MIN(notes.id)'), Arel.sql('MAX(notes.id)')).first
-      migrate_in(index * DELAY, MIGRATION, ['Epic', JOIN, QUERY_CONDITIONS, true, *range])
-    end
-  end
-
-  def down
-    # no-op
-    # temporary index is to be dropped in a different migration in an upcoming release:
-    # https://gitlab.com/gitlab-org/gitlab/issues/196842
-  end
-end
diff --git a/db/schema.rb b/db/schema.rb
index 0b261a2461d..a9dcfa50d33 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -2921,6 +2921,21 @@ ActiveRecord::Schema.define(version: 2020_03_11_165635) do
     t.index ["access_grant_id"], name: "index_oauth_openid_requests_on_access_grant_id"
   end
 
+  create_table "open_project_tracker_data", force: :cascade do |t|
+    t.integer "service_id", null: false
+    t.datetime_with_timezone "created_at", null: false
+    t.datetime_with_timezone "updated_at", null: false
+    t.string "encrypted_url", limit: 255
+    t.string "encrypted_url_iv", limit: 255
+    t.string "encrypted_api_url", limit: 255
+    t.string "encrypted_api_url_iv", limit: 255
+    t.string "encrypted_token", limit: 255
+    t.string "encrypted_token_iv", limit: 255
+    t.string "closed_status_id", limit: 5
+    t.string "project_identifier_code", limit: 100
+    t.index ["service_id"], name: "index_open_project_tracker_data_on_service_id"
+  end
+
   create_table "operations_feature_flag_scopes", force: :cascade do |t|
     t.bigint "feature_flag_id", null: false
     t.datetime_with_timezone "created_at", null: false
@@ -4993,6 +5008,7 @@ ActiveRecord::Schema.define(version: 2020_03_11_165635) do
   add_foreign_key "notes", "reviews", name: "fk_2e82291620", on_delete: :nullify
   add_foreign_key "notification_settings", "users", name: "fk_0c95e91db7", on_delete: :cascade
   add_foreign_key "oauth_openid_requests", "oauth_access_grants", column: "access_grant_id", name: "fk_77114b3b09", on_delete: :cascade
+  add_foreign_key "open_project_tracker_data", "services", on_delete: :cascade
   add_foreign_key "operations_feature_flag_scopes", "operations_feature_flags", column: "feature_flag_id", on_delete: :cascade
   add_foreign_key "operations_feature_flags", "projects", on_delete: :cascade
   add_foreign_key "operations_feature_flags_clients", "projects", on_delete: :cascade
diff --git a/doc/README.md b/doc/README.md
index 198f37c9ea1..95a8b09dd07 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -238,7 +238,7 @@ The following documentation relates to the DevOps **Verify** stage:
 | [GitLab CI/CD](ci/README.md)                                                      | Explore the features and capabilities of Continuous Integration with GitLab.                            |
 | [JUnit test reports](ci/junit_test_reports.md)                                    | Display JUnit test reports on merge requests.                                                           |
 | [Multi-project pipelines](ci/multi_project_pipelines.md) **(PREMIUM)**            | Visualize entire pipelines that span multiple projects, including all cross-project inter-dependencies. |
-| [Pipeline Graphs](ci/pipelines.md#visualizing-pipelines)                          | Visualize builds.                                                                                       |
+| [Pipeline Graphs](ci/pipelines/index.md#visualizing-pipelines)                          | Visualize builds.                                                                                       |
 | [Review Apps](ci/review_apps/index.md)                                            | Preview changes to your application right from a merge request.                                         |
 
 <div align="right">
diff --git a/doc/administration/compliance.md b/doc/administration/compliance.md
index 52b6867a310..8cd10f5ea4e 100644
--- a/doc/administration/compliance.md
+++ b/doc/administration/compliance.md
@@ -17,4 +17,4 @@ GitLab’s [security features](../security/README.md) may also help you meet rel
 |**[Audit logs](audit_events.md)**<br>To maintain the integrity of your code, GitLab Enterprise Edition Premium gives admins the ability to view any modifications made within the GitLab server in an advanced audit log system, so you can control, analyze, and track every change.|Premium+||
 |**[Auditor users](auditor_users.md)**<br>Auditor users are users who are given read-only access to all projects, groups, and other resources on the GitLab instance.|Premium+||
 |**[Credentials inventory](../user/admin_area/credentials_inventory.md)**<br>With a credentials inventory, GitLab administrators can keep track of the credentials used by all of the users in their GitLab instance. |Ultimate||
-|**Separation of Duties using [Protected branches](../user/project/protected_branches.md#protected-branches-approval-by-code-owners-premium) and [custom CI Configuration Paths](../user/project/pipelines/settings.md#custom-ci-configuration-path)**<br> GitLab Silver and Premium users can leverage GitLab's cross-project YAML configuration's to define deployers of code and developers of code. View the [Separation of Duties Deploy Project](https://gitlab.com/guided-explorations/separation-of-duties-deploy/blob/master/README.md) and [Separation of Duties Project](https://gitlab.com/guided-explorations/separation-of-duties/blob/master/README.md) to see how to use this set up to define these roles.|Premium+||
+|**Separation of Duties using [Protected branches](../user/project/protected_branches.md#protected-branches-approval-by-code-owners-premium) and [custom CI Configuration Paths](../ci/pipelines/settings.md#custom-ci-configuration-path)**<br> GitLab Silver and Premium users can leverage GitLab's cross-project YAML configuration's to define deployers of code and developers of code. View the [Separation of Duties Deploy Project](https://gitlab.com/guided-explorations/separation-of-duties-deploy/blob/master/README.md) and [Separation of Duties Project](https://gitlab.com/guided-explorations/separation-of-duties/blob/master/README.md) to see how to use this set up to define these roles.|Premium+||
diff --git a/doc/api/projects.md b/doc/api/projects.md
index 5b769ca4ce9..a00bd442872 100644
--- a/doc/api/projects.md
+++ b/doc/api/projects.md
@@ -1174,7 +1174,7 @@ PUT /projects/:id
 | `auto_cancel_pending_pipelines` | string | no | Auto-cancel pending pipelines (Note: this is not a boolean, but enabled/disabled |
 | `build_coverage_regex` | string | no | Test coverage parsing |
 | `ci_config_path` | string | no | The path to CI config file |
-| `ci_default_git_depth` | integer | no | Default number of revisions for [shallow cloning](../user/project/pipelines/settings.md#git-shallow-clone) |
+| `ci_default_git_depth` | integer | no | Default number of revisions for [shallow cloning](../ci/pipelines/settings.md#git-shallow-clone) |
 | `auto_devops_enabled` | boolean | no | Enable Auto DevOps for this project |
 | `auto_devops_deploy_strategy` | string | no | Auto Deploy strategy (`continuous`, `manual` or `timed_incremental`) |
 | `repository_storage` | string | no | Which storage shard the repository is on. Available only to admins |
diff --git a/doc/ci/README.md b/doc/ci/README.md
index 1ec91dd8522..fe88b414702 100644
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
@@ -80,13 +80,13 @@ GitLab CI/CD supports numerous configuration options:
 
 | Configuration | Description  |
 |:--------------|:-------------|
-| [Pipelines](pipelines.md) | Structure your CI/CD process through pipelines. |
+| [Pipelines](pipelines/index.md) | Structure your CI/CD process through pipelines. |
 | [Environment variables](variables/README.md) | Reuse values based on a variable/value key pair. |
 | [Environments](environments.md) | Deploy your application to different environments (e.g., staging, production). |
 | [Job artifacts](pipelines/job_artifacts.md) | Output, use, and reuse job artifacts. |
 | [Cache dependencies](caching/index.md) | Cache your dependencies for a faster execution. |
 | [Schedule pipelines](pipelines/schedules.md) | Schedule pipelines to run as often as you need. |
-| [Custom path for `.gitlab-ci.yml`](../user/project/pipelines/settings.md#custom-ci-configuration-path) | Define a custom path for the CI/CD configuration file. |
+| [Custom path for `.gitlab-ci.yml`](pipelines/settings.md#custom-ci-configuration-path) | Define a custom path for the CI/CD configuration file. |
 | [Git submodules for CI/CD](git_submodules.md) | Configure jobs for using Git submodules.|
 | [SSH keys for CI/CD](ssh_keys/README.md) | Using SSH keys in your CI pipelines. |
 | [Pipelines triggers](triggers/README.md) | Trigger pipelines through the API. |
@@ -149,7 +149,7 @@ As a GitLab administrator, you can change the default behavior
 of GitLab CI/CD for:
 
 - An [entire GitLab instance](../user/admin_area/settings/continuous_integration.md).
-- Specific projects, using [pipelines settings](../user/project/pipelines/settings.md).
+- Specific projects, using [pipelines settings](pipelines/settings.md).
 
 See also:
 
diff --git a/doc/ci/environments.md b/doc/ci/environments.md
index ff4096600e0..2268ab309c3 100644
--- a/doc/ci/environments.md
+++ b/doc/ci/environments.md
@@ -47,7 +47,7 @@ can even access a [web terminal](#web-terminals) for your environment from withi
 
 Configuring environments involves:
 
-1. Understanding how [pipelines](pipelines.md) work.
+1. Understanding how [pipelines](pipelines/index.md) work.
 1. Defining environments in your project's [`.gitlab-ci.yml`](yaml/README.md) file.
 1. Creating a job configured to deploy your application. For example, a deploy job configured with [`environment`](yaml/README.md#environment) to deploy your application to a [Kubernetes cluster](../user/project/clusters/index.md).
 
diff --git a/doc/ci/examples/test-scala-application.md b/doc/ci/examples/test-scala-application.md
index 7d039ab1aeb..ffdffcc88bd 100644
--- a/doc/ci/examples/test-scala-application.md
+++ b/doc/ci/examples/test-scala-application.md
@@ -60,7 +60,7 @@ You can use other versions of Scala and SBT by defining them in
 
 Add the `Coverage was \[\d+.\d+\%\]` regular expression in the
 **Settings ➔ Pipelines ➔ Coverage report** project setting to
-retrieve the [test coverage](../../user/project/pipelines/settings.md#test-coverage-report-badge)
+retrieve the [test coverage](../pipelines/settings.md#test-coverage-report-badge)
 rate from the build trace and have it displayed with your jobs.
 
 **Pipelines** must be enabled for this option to appear.
diff --git a/doc/ci/img/collapsible_log_v12_6.png b/doc/ci/img/collapsible_log_v12_6.png
deleted file mode 100644
index 24b2c83f7c1..00000000000
Binary files a/doc/ci/img/collapsible_log_v12_6.png and /dev/null differ
diff --git a/doc/ci/img/job_failure_reason.png b/doc/ci/img/job_failure_reason.png
deleted file mode 100644
index d44b8e6d1be..00000000000
Binary files a/doc/ci/img/job_failure_reason.png and /dev/null differ
diff --git a/doc/ci/img/manual_job_variables.png b/doc/ci/img/manual_job_variables.png
deleted file mode 100644
index a5ed351fdcd..00000000000
Binary files a/doc/ci/img/manual_job_variables.png and /dev/null differ
diff --git a/doc/ci/img/pipeline-delete.png b/doc/ci/img/pipeline-delete.png
deleted file mode 100644
index d9dba1f455d..00000000000
Binary files a/doc/ci/img/pipeline-delete.png and /dev/null differ
diff --git a/doc/ci/img/pipeline_incremental_rollout.png b/doc/ci/img/pipeline_incremental_rollout.png
deleted file mode 100644
index b3498e9a5a5..00000000000
Binary files a/doc/ci/img/pipeline_incremental_rollout.png and /dev/null differ
diff --git a/doc/ci/img/pipelines.png b/doc/ci/img/pipelines.png
deleted file mode 100644
index a604fcb2587..00000000000
Binary files a/doc/ci/img/pipelines.png and /dev/null differ
diff --git a/doc/ci/img/pipelines_duration_chart.png b/doc/ci/img/pipelines_duration_chart.png
deleted file mode 100644
index 0be7539ba0a..00000000000
Binary files a/doc/ci/img/pipelines_duration_chart.png and /dev/null differ
diff --git a/doc/ci/img/pipelines_grouped.png b/doc/ci/img/pipelines_grouped.png
deleted file mode 100644
index 82814754747..00000000000
Binary files a/doc/ci/img/pipelines_grouped.png and /dev/null differ
diff --git a/doc/ci/img/pipelines_index.png b/doc/ci/img/pipelines_index.png
deleted file mode 100644
index e168e7e23df..00000000000
Binary files a/doc/ci/img/pipelines_index.png and /dev/null differ
diff --git a/doc/ci/img/pipelines_mini_graph.png b/doc/ci/img/pipelines_mini_graph.png
deleted file mode 100644
index 8656b02f60d..00000000000
Binary files a/doc/ci/img/pipelines_mini_graph.png and /dev/null differ
diff --git a/doc/ci/img/pipelines_mini_graph_simple.png b/doc/ci/img/pipelines_mini_graph_simple.png
deleted file mode 100644
index d00a8313088..00000000000
Binary files a/doc/ci/img/pipelines_mini_graph_simple.png and /dev/null differ
diff --git a/doc/ci/img/pipelines_mini_graph_sorting.png b/doc/ci/img/pipelines_mini_graph_sorting.png
deleted file mode 100644
index 3a4e5453360..00000000000
Binary files a/doc/ci/img/pipelines_mini_graph_sorting.png and /dev/null differ
diff --git a/doc/ci/img/pipelines_success_chart.png b/doc/ci/img/pipelines_success_chart.png
deleted file mode 100644
index 10602b75eeb..00000000000
Binary files a/doc/ci/img/pipelines_success_chart.png and /dev/null differ
diff --git a/doc/ci/jenkins/index.md b/doc/ci/jenkins/index.md
index 2678936ae70..f3e9efae7d4 100644
--- a/doc/ci/jenkins/index.md
+++ b/doc/ci/jenkins/index.md
@@ -48,7 +48,7 @@ There are some high level differences between the products worth mentioning:
 
   - on push
   - on [schedule](../pipelines/schedules.md)
-  - from the [GitLab UI](../pipelines.md#manually-executing-pipelines)
+  - from the [GitLab UI](../pipelines/index.md#manually-executing-pipelines)
   - by [API call](../triggers/README.md)
   - by [webhook](../triggers/README.md#triggering-a-pipeline-from-a-webhook)
   - by [ChatOps](../chatops/README.md)
@@ -83,6 +83,29 @@ There are some high level differences between the products worth mentioning:
   own environment, which will be slower and may be less consistent. We have extensive docs on [how to use the Container Registry](../../user/packages/container_registry/index.md).
 - Totally stuck and not sure where to turn for advice? The [GitLab community forum](https://forum.gitlab.com/) can be a great resource.
 
+## Agents vs. Runners
+
+Both Jenkins agents and GitLab Runners are the hosts that run jobs. To convert the
+Jenkins agent, simply uninstall it and then [install and register the runner](../runners/README.md).
+Runners do not require much overhead, so you can size them similarly to the Jenkins
+agents you were using.
+
+There are some important differences in the way Runners work in comparison to agents:
+
+- Runners can be set up as [shared across an instance, be added at the group level, or set up at the project level](../runners/README.md#shared-specific-and-group-runners).
+  They will self-select jobs from the scopes you've defined automatically.
+- You can also [use tags](../runners/README.md#using-tags) for finer control, and
+  associate runners with specific jobs. For example, you can use a tag for jobs that
+  require dedicated, more powerful, or specific hardware.
+- GitLab has [autoscaling for Runners](https://docs.gitlab.com/runner/configuration/autoscale.html)
+  which will let configure them to be provisioned as needed, and scaled down when not.
+  This is similar to ephemeral agents in Jenkins.
+
+If you are using `gitlab.com`, you can take advantage of our [shared Runner fleet](../../user/gitlab_com/index.md#shared-runners)
+to run jobs without provisioning your own Runners. We are investigating making them
+[available for self-managed instances](https://gitlab.com/gitlab-org/customers-gitlab-com/issues/414)
+as well.
+
 ## Groovy vs. YAML
 
 Jenkins Pipelines are based on [Groovy](https://groovy-lang.org/), so the pipeline specification is written as code.
diff --git a/doc/ci/junit_test_reports.md b/doc/ci/junit_test_reports.md
index c82f0ab3a42..1595f4d4427 100644
--- a/doc/ci/junit_test_reports.md
+++ b/doc/ci/junit_test_reports.md
@@ -9,7 +9,7 @@ Requires GitLab Runner 11.2 and above.
 
 ## Overview
 
-It is very common that a [CI/CD pipeline](pipelines.md) contains a
+It is very common that a [CI/CD pipeline](pipelines/index.md) contains a
 test job that will verify your code.
 If the tests fail, the pipeline fails and users get notified. The person that
 works on the merge request will have to check the job logs and see where the
@@ -42,13 +42,15 @@ JUnit test reports, where:
 - The base branch is the target branch (usually `master`).
 - The head branch is the source branch (the latest pipeline in each merge request).
 
-The reports panel has a summary showing how many tests failed and how many were fixed.
-If no comparison can be done because data for the base branch is not available,
-the panel will just show the list of failed tests for head.
+The reports panel has a summary showing how many tests failed, how many had errors
+and how many were fixed. If no comparison can be done because data for the base branch
+is not available, the panel will just show the list of failed tests for head.
 
-There are three types of results:
+There are four types of results:
 
 1. **Newly failed tests:** Test cases which passed on base branch and failed on head branch
+1. **Newly encountered errors:** Test cases which passed on base branch and failed due to a
+   test error on head branch
 1. **Existing failures:**  Test cases which failed on base branch and failed on head branch
 1. **Resolved failures:**  Test cases which failed on base branch and passed on head branch
 
diff --git a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
index bab93392587..6dbc8f98247 100644
--- a/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
+++ b/doc/ci/merge_request_pipelines/pipelines_for_merged_results/index.md
@@ -115,7 +115,7 @@ unexpected timing. For example, when a source or target branch is advanced.
 In this case, the pipeline fails because of `fatal: reference is not a tree:` error,
 which indicates that the checkout-SHA is not found in the merge ref.
 
-This behavior was improved at GitLab 12.4 by introducing [Persistent pipeline refs](../../pipelines.md#persistent-pipeline-refs).
+This behavior was improved at GitLab 12.4 by introducing [Persistent pipeline refs](../../pipelines/index.md#persistent-pipeline-refs).
 You should be able to create pipelines at any timings without concerning the error.
 
 ## Using Merge Trains **(PREMIUM)**
diff --git a/doc/ci/multi_project_pipelines.md b/doc/ci/multi_project_pipelines.md
index d56935dc3a3..6a4dff635ad 100644
--- a/doc/ci/multi_project_pipelines.md
+++ b/doc/ci/multi_project_pipelines.md
@@ -40,7 +40,7 @@ With Multi-Project Pipelines you can visualize the entire pipeline, including al
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/2121) in [GitLab Premium 9.3](https://about.gitlab.com/releases/2017/06/22/gitlab-9-3-released/#multi-project-pipeline-graphs).
 
 When you configure GitLab CI for your project, you can visualize the stages of your
-[jobs](pipelines.md#configuring-pipelines) on a [pipeline graph](pipelines.md#visualizing-pipelines).
+[jobs](pipelines/index.md#configuring-pipelines) on a [pipeline graph](pipelines/index.md#visualizing-pipelines).
 
 ![Multi-project pipeline graph](img/multi_project_pipeline_graph.png)
 
diff --git a/doc/ci/pipelines.md b/doc/ci/pipelines.md
index cf872b0ee1d..edebd12f07a 100644
--- a/doc/ci/pipelines.md
+++ b/doc/ci/pipelines.md
@@ -1,566 +1,5 @@
 ---
-type: reference
+redirect_to: 'pipelines/index.md'
 ---
 
-# Creating and using CI/CD pipelines
-
-> Introduced in GitLab 8.8.
-
-NOTE: **Tip:**
-Watch our
-["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
-webcast to see a comprehensive demo of GitLab CI/CD pipeline.
-
-## Introduction
-
-Pipelines are the top-level component of continuous integration, delivery, and deployment.
-
-Pipelines comprise:
-
-- Jobs that define what to run. For example, code compilation or test runs.
-- Stages that define when and how to run. For example, that tests run only after code compilation.
-
-Multiple jobs in the same stage are executed by [Runners](runners/README.md) in parallel, if there are enough concurrent [Runners](runners/README.md).
-
-If all the jobs in a stage:
-
-- Succeed, the pipeline moves on to the next stage.
-- Fail, the next stage is not (usually) executed and the pipeline ends early.
-
-NOTE: **Note:**
-If you have a [mirrored repository that GitLab pulls from](../user/project/repository/repository_mirroring.md#pulling-from-a-remote-repository-starter),
-you may need to enable pipeline triggering in your project's
-**Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**.
-
-### Simple pipeline example
-
-As an example, imagine a pipeline consisting of four stages, executed in the following order:
-
-- `build`, with a job called `compile`.
-- `test`, with two jobs called `test` and `test2`.
-- `staging`, with a job called `deploy-to-stage`.
-- `production`, with a job called `deploy-to-prod`.
-
-## Visualizing pipelines
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5742) in GitLab 8.11.
-
-Pipelines can be complex structures with many sequential and parallel jobs.
-
-To make it easier to understand the flow of a pipeline, GitLab has pipeline graphs for viewing pipelines
-and their statuses.
-
-Pipeline graphs can be displayed in two different ways, depending on the page you
-access the graph from.
-
-NOTE: **Note:**
-GitLab capitalizes the stages' names when shown in the pipeline graphs (below).
-
-### Regular pipeline graphs
-
-Regular pipeline graphs show the names of the jobs of each stage. Regular pipeline graphs can
-be found when you are on a [single pipeline page](#accessing-pipelines). For example:
-
-![Pipelines example](img/pipelines.png)
-
-### Pipeline mini graphs
-
-Pipeline mini graphs take less space and can tell you at a
-quick glance if all jobs passed or something failed. The pipeline mini graph can
-be found when you navigate to:
-
-- The pipelines index page.
-- A single commit page.
-- A merge request page.
-
-Pipeline mini graphs allow you to see all related jobs for a single commit and the net result
-of each stage of your pipeline. This allows you to quickly see what failed and
-fix it.
-
-Stages in pipeline mini graphs are collapsible. Hover your mouse over them and click to expand their jobs.
-
-| Mini graph                                                   | Mini graph expanded                                            |
-|:-------------------------------------------------------------|:---------------------------------------------------------------|
-| ![Pipelines mini graph](img/pipelines_mini_graph_simple.png) | ![Pipelines mini graph extended](img/pipelines_mini_graph.png) |
-
-### Job ordering in pipeline graphs
-
-Job ordering depends on the type of pipeline graph. For [regular pipeline graphs](#regular-pipeline-graphs), jobs are sorted by name.
-
-For [pipeline mini graphs](#pipeline-mini-graphs) ([introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9760)
-in GitLab 9.0), jobs are sorted by severity and then by name.
-
-The order of severity is:
-
-- failed
-- warning
-- pending
-- running
-- manual
-- scheduled
-- canceled
-- success
-- skipped
-- created
-
-For example:
-
-![Pipeline mini graph sorting](img/pipelines_mini_graph_sorting.png)
-
-### Expanding and collapsing job log sections
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/14664) in GitLab
-> 12.0.
-
-Job logs are divided into sections that can be collapsed or expanded. Each section will display
-the duration.
-
-In the following example:
-
-- Two sections are collapsed and can be expanded.
-- Three sections are expanded and can be collapsed.
-
-![Collapsible sections](img/collapsible_log_v12_6.png)
-
-#### Custom collapsible sections
-
-You can create collapsible sections in job logs by manually outputting special codes
-that GitLab will use to determine what sections to collapse:
-
-- Section start marker: `section_start:UNIX_TIMESTAMP:SECTION_NAME\r\e[0K` + `TEXT_OF_SECTION_HEADER`
-- Section end marker: `section_end:UNIX_TIMESTAMP:SECTION_NAME\r\e[0K`
-
-You must add these codes to the script section of the CI configuration. For example,
-using `echo`:
-
-```yaml
-job1:
-  script:
-    - echo -e "section_start:`date +%s`:my_first_section\r\e[0KHeader of the 1st collapsible section"
-    - echo 'this line should be hidden when collapsed'
-    - echo -e "section_end:`date +%s`:my_first_section\r\e[0K"
-```
-
-In the example above:
-
-- `date +%s`: The Unix timestamp (for example `1560896352`).
-- `my_first_section`: The name given to the section.
-- `\r\e[0K`: Prevents the section markers from displaying in the rendered (colored)
-  job log, but they are displayed in the raw job log. To see them, in the top right
-  of the job log, click **{doc-text}** (**Show complete raw**).
-  - `\r`: carriage return.
-  - `\e[0K`: clear line ANSI escape code.
-
-Sample raw job log:
-
-```plaintext
-section_start:1560896352:my_first_section\r\e[0KHeader of the 1st collapsible section
-this line should be hidden when collapsed
-section_end:1560896353:my_first_section\r\e[0K
-```
-
-### Pipeline success and duration charts
-
-> - Introduced in GitLab 3.1.1 as Commit Stats, and later renamed to Pipeline Charts.
-> - [Renamed](https://gitlab.com/gitlab-org/gitlab/issues/38318) to CI / CD Analytics in GitLab 12.8.
-
-GitLab tracks the history of your pipeline successes and failures, as well as how long each pipeline ran. To view this information, go to **Analytics > CI / CD Analytics**.
-
-View successful pipelines:
-
-![Successful pipelines](img/pipelines_success_chart.png)
-
-View pipeline duration history:
-
-![Pipeline duration](img/pipelines_duration_chart.png)
-
-## Pipeline quotas
-
-Each user has a personal pipeline quota that tracks the usage of shared runners in all personal projects.
-Each group has a [usage quota](../subscriptions/index.md#ci-pipeline-minutes) that tracks the usage of shared runners for all projects created within the group.
-
-When a pipeline is triggered, regardless of who triggered it, the pipeline quota for the project owner's [namespace](../user/group/index.md#namespaces) is used. In this case, the namespace can be the user or group that owns the project.
-
-### How pipeline duration is calculated
-
-Total running time for a given pipeline excludes retries and pending
-(queued) time.
-
-Each job is represented as a `Period`, which consists of:
-
-- `Period#first` (when the job started).
-- `Period#last` (when the job finished).
-
-A simple example is:
-
-- A (1, 3)
-- B (2, 4)
-- C (6, 7)
-
-In the example:
-
-- A begins at 1 and ends at 3.
-- B begins at 2 and ends at 4.
-- C begins at 6 and ends at 7.
-
-Visually, it can be viewed as:
-
-```text
-0  1  2  3  4  5  6  7
-   AAAAAAA
-      BBBBBBB
-                  CCCC
-```
-
-The union of A, B, and C is (1, 4) and (6, 7). Therefore, the total running time is:
-
-```text
-(4 - 1) + (7 - 6) => 4
-```
-
-## Configuring pipelines
-
-Pipelines, and their component jobs and stages, are defined in the [`.gitlab-ci.yml`](yaml/README.md) file for each project.
-
-In particular:
-
-- Jobs are the [basic configuration](yaml/README.md#introduction) component.
-- Stages are defined using the [`stages`](yaml/README.md#stages) keyword.
-
-For all available configuration options, see the [GitLab CI/CD Pipeline Configuration Reference](yaml/README.md).
-
-### Settings and schedules
-
-In addition to configuring jobs through `.gitlab-ci.yml`, additional configuration options are available
-through the GitLab UI:
-
-- Pipeline settings for each project. For more information, see [Pipeline settings](../user/project/pipelines/settings.md).
-- Schedules for pipelines. For more information, see [Pipeline schedules](../user/project/pipelines/schedules.md).
-
-### Grouping jobs
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/6242) in GitLab 8.12.
-
-If you have many similar jobs, your [pipeline graph](#visualizing-pipelines) becomes long and hard
-to read.
-
-For that reason, similar jobs can automatically be grouped together.
-If the job names are formatted in certain ways, they will be collapsed into
-a single group in regular pipeline graphs (not the mini graphs).
-
-You'll know when a pipeline has grouped jobs if you don't see the retry or
-cancel button inside them. Hovering over them will show the number of grouped
-jobs. Click to expand them.
-
-![Grouped pipelines](img/pipelines_grouped.png)
-
-#### Configuring grouping
-
-In the pipeline [configuration file](yaml/README.md), job names must include two numbers separated with one of
-the following (you can even use them interchangeably):
-
-- A space.
-- A slash (`/`).
-- A colon (`:`).
-
-NOTE: **Note:**
-More specifically, it uses [this](https://gitlab.com/gitlab-org/gitlab/blob/2f3dc314f42dbd79813e6251792853bc231e69dd/app/models/commit_status.rb#L99) regular expression: `\d+[\s:\/\\]+\d+\s*`.
-
-#### How grouping works
-
-The jobs will be ordered by comparing those two numbers from left to right. You
-usually want the first to be the index and the second the total.
-
-For example, the following jobs will be grouped under a job named `test`:
-
-- `test 0 3`
-- `test 1 3`
-- `test 2 3`
-
-The following jobs will be grouped under a job named `test ruby`:
-
-- `test 1:2 ruby`
-- `test 2:2 ruby`
-
-The following jobs will be grouped under a job named `test ruby` as well:
-
-- `1/3 test ruby`
-- `2/3 test ruby`
-- `3/3 test ruby`
-
-### Pipelines for merge requests
-
-GitLab supports configuring pipelines that run only for merge requests. For more information, see
-[Pipelines for merge requests](merge_request_pipelines/index.md).
-
-### Badges
-
-Pipeline status and test coverage report badges are available and configurable for each project.
-
-For information on adding pipeline badges to projects, see [Pipeline badges](../user/project/pipelines/settings.md#pipeline-badges).
-
-## Multi-project pipelines
-
-Pipelines for different projects can be combined together into [Multi-project pipelines](multi_project_pipelines.md).
-
-[Multi-project pipeline graphs](multi_project_pipelines.md#multi-project-pipeline-visualization-premium) help
-you visualize the entire pipeline, including all cross-project inter-dependencies. **(PREMIUM)**
-
-## Parent-child pipelines
-
-Complex pipelines can be broken down into one parent pipeline that can trigger
-multiple child sub-pipelines, which all run in the same project and with the same SHA.
-
-For more information, see [Parent-Child pipelines](parent_child_pipelines.md).
-
-## Working with pipelines
-
-In general, pipelines are executed automatically and require no intervention once created.
-
-However, there are instances where you'll need to interact with pipelines. These are documented below.
-
-### Manually executing pipelines
-
-Pipelines can be manually executed, with predefined or manually-specified [variables](variables/README.md).
-
-You might do this if the results of a pipeline (for example, a code build) is required outside the normal
-operation of the pipeline.
-
-To execute a pipeline manually:
-
-1. Navigate to your project's **CI/CD > Pipelines**.
-1. Click on the **Run Pipeline** button.
-1. On the **Run Pipeline** page:
-    1. Select the branch to run the pipeline for in the **Create for** field.
-    1. Enter any [environment variables](variables/README.md) required for the pipeline run.
-    1. Click the **Create pipeline** button.
-
-The pipeline will execute the jobs as configured.
-
-#### Using a query string
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/24146) in GitLab 12.5.
-
-Variables on the **Run Pipeline** page can be pre-populated by passing variable keys and values
-in a query string appended to the `pipelines/new` URL. The format is:
-
-```plaintext
-.../pipelines/new?ref=<branch>&var[<variable_key>]=<value>&file_var[<file_key>]=<value>
-```
-
-The following parameters are supported:
-
-- `ref`: specify the branch to populate the **Run for** field with.
-- `var`: specify a `Variable` variable.
-- `file_var`: specify a `File` variable.
-
-For each `var` or `file_var`, a key and value are required.
-
-For example, the query string
-`.../pipelines/new?ref=my_branch&var[foo]=bar&file_var[file_foo]=file_bar` will pre-populate the
-**Run Pipeline** page as follows:
-
-- **Run for** field: `my_branch`.
-- **Variables** section:
-  - Variable:
-    - Key: `foo`
-    - Value: `bar`
-  - File:
-    - Key: `file_foo`
-    - Value: `file_bar`
-
-### Accessing pipelines
-
-You can find the current and historical pipeline runs under your project's
-**CI/CD > Pipelines** page. You can also access pipelines for a merge request by navigating
-to its **Pipelines** tab.
-
-![Pipelines index page](img/pipelines_index.png)
-
-Clicking on a pipeline will bring you to the **Pipeline Details** page and show
-the jobs that were run for that pipeline. From here you can cancel a running pipeline,
-retry jobs on a failed pipeline, or [delete a pipeline](#deleting-a-single-pipeline).
-
-### Accessing individual jobs
-
-When you access a pipeline, you can see the related jobs for that pipeline.
-
-Clicking on an individual job will show you its job log, and allow you to:
-
-- Cancel the job.
-- Retry the job.
-- Erase the job log.
-
-### Seeing the failure reason for jobs
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17782) in GitLab 10.7.
-
-When a pipeline fails or is allowed to fail, there are several places where you
-can quickly check the reason it failed:
-
-- In the pipeline graph, on the pipeline detail view.
-- In the pipeline widgets, in the merge requests and commit pages.
-- In the job views, in the global and detailed views of a job.
-
-In each place, if you hover over the failed job you can see the reason it failed.
-
-![Pipeline detail](img/job_failure_reason.png)
-
-From [GitLab 10.8](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17814),
-you can also see the reason it failed on the Job detail page.
-
-### Manual actions from pipeline graphs
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7931) in GitLab 8.15.
-
-Manual actions, configured using the [`when:manual`](yaml/README.md#whenmanual) parameter,
-allow you to require manual interaction before moving forward in the pipeline.
-
-You can do this straight from the pipeline graph. Just click on the play button
-to execute that particular job.
-
-For example, your pipeline start automatically, but require manual action to
-[deploy to production](environments.md#configuring-manual-deployments). In the example below, the `production`
-stage has a job with a manual action.
-
-![Pipelines example](img/pipelines.png)
-
-### Specifying variables when running manual jobs
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30485) in GitLab 12.2.
-
-When running manual jobs you can supply additional job specific variables.
-
-You can do this from the job page of the manual job you want to run with
-additional variables.
-
-This is useful when you want to alter the execution of a job by using
-environment variables.
-
-![Manual job variables](img/manual_job_variables.png)
-
-### Delay a job in a pipeline graph
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/21767) in GitLab 11.4.
-
-When you do not want to run a job immediately, you can use the [`when:delayed`](yaml/README.md#whendelayed) parameter to
-delay a job's execution for a certain period.
-
-This is especially useful for timed incremental rollout where new code is rolled out gradually.
-
-For example, if you start rolling out new code and:
-
-- Users do not experience trouble, GitLab can automatically complete the deployment from 0% to 100%.
-- Users experience trouble with the new code, you can stop the timed incremental rollout by canceling the pipeline
-  and [rolling](environments.md#retrying-and-rolling-back) back to the last stable version.
-
-![Pipelines example](img/pipeline_incremental_rollout.png)
-
-### Using the API
-
-GitLab provides API endpoints to:
-
-- Perform basic functions. For more information, see [Pipelines API](../api/pipelines.md).
-- Maintain pipeline schedules. For more information, see [Pipeline schedules API](../api/pipeline_schedules.md).
-- Trigger pipeline runs. For more information, see:
-  - [Triggering pipelines through the API](triggers/README.md).
-  - [Pipeline triggers API](../api/pipeline_triggers.md).
-
-### Start multiple manual actions in a stage
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27188) in GitLab 11.11.
-
-Multiple manual actions in a single stage can be started at the same time using the "Play all manual" button.
-Once the user clicks this button, each individual manual action will be triggered and refreshed
-to an updated status.
-
-This functionality is only available:
-
-- For users with at least Developer access.
-- If the the stage contains [manual actions](#manual-actions-from-pipeline-graphs).
-
-### Deleting a single pipeline
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/24851) in GitLab 12.7.
-
-Users with [owner permissions](../user/permissions.md) in a project can delete a pipeline
-by clicking on the pipeline in the **CI/CD > Pipelines** to get to the **Pipeline Details**
-page, then using the **Delete** button.
-
-![Pipeline Delete Button](img/pipeline-delete.png)
-
-CAUTION: **Warning:**
-Deleting a pipeline will expire all pipeline caches, and delete all related objects,
-such as builds, logs, artifacts, and triggers. **This action cannot be undone.**
-
-## Most Recent Pipeline
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/50499) in GitLab 12.3.
-
-There's a link to the latest pipeline for the last commit of a given branch at `/project/pipelines/[branch]/latest`. Also, `/project/pipelines/latest` will redirect you to the latest pipeline for the last commit on the project's default branch.
-
-## Security on protected branches
-
-A strict security model is enforced when pipelines are executed on
-[protected branches](../user/project/protected_branches.md).
-
-The following actions are allowed on protected branches only if the user is
-[allowed to merge or push](../user/project/protected_branches.md#using-the-allowed-to-merge-and-allowed-to-push-settings)
-on that specific branch:
-
-- Run manual pipelines (using the [Web UI](#manually-executing-pipelines) or pipelines API).
-- Run scheduled pipelines.
-- Run pipelines using triggers.
-- Trigger manual actions on existing pipelines.
-- Retry or cancel existing jobs (using the Web UI or pipelines API).
-
-**Variables** marked as **protected** are accessible only to jobs that
-run on protected branches, preventing untrusted users getting unintended access to
-sensitive information like deployment credentials and tokens.
-
-**Runners** marked as **protected** can run jobs only on protected
-branches, avoiding untrusted code to be executed on the protected runner and
-preserving deployment keys and other credentials from being unintentionally
-accessed. In order to ensure that jobs intended to be executed on protected
-runners will not use regular runners, they must be tagged accordingly.
-
-## Persistent pipeline refs
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17043) in GitLab 12.4.
-
-Previously, you'd have encountered unexpected pipeline failures when you force-pushed
-a branch to its remote repository. To illustrate the problem, suppose you've had the current workflow:
-
-1. A user creates a feature branch named `example` and pushes it to a remote repository.
-1. A new pipeline starts running on the `example` branch.
-1. A user rebases the `example` branch on the latest `master` branch and force-pushes it to its remote repository.
-1. A new pipeline starts running on the `example` branch again, however,
-   the previous pipeline (2) fails because of `fatal: reference is not a tree:` error.
-
-This is because the previous pipeline cannot find a checkout-SHA (which associated with the pipeline record)
-from the `example` branch that the commit history has already been overwritten by the force-push.
-Similarly, [Pipelines for merged results](merge_request_pipelines/pipelines_for_merged_results/index.md)
-might have failed intermittently due to [the same reason](merge_request_pipelines/pipelines_for_merged_results/index.md#intermittently-pipelines-fail-by-fatal-reference-is-not-a-tree-error).
-
-As of GitLab 12.4, we've improved this behavior by persisting pipeline refs exclusively.
-To illustrate its life cycle:
-
-1. A pipeline is created on a feature branch named `example`.
-1. A persistent pipeline ref is created at `refs/pipelines/<pipeline-id>`,
-   which retains the checkout-SHA of the associated pipeline record.
-   This persistent ref stays intact during the pipeline execution,
-   even if the commit history of the `example` branch has been overwritten by force-push.
-1. GitLab Runner fetches the persistent pipeline ref and gets source code from the checkout-SHA.
-1. When the pipeline finished, its persistent ref is cleaned up in a background process.
-
-NOTE: **NOTE**: At this moment, this feature is on by default and can be manually disabled
-by disabling `depend_on_persistent_pipeline_ref` feature flag. If you're interested in
-manually disabling this behavior, please ask the administrator
-to execute the following commands in rails console.
-
-```shell
-> sudo gitlab-rails console                                        # Login to Rails console of GitLab instance.
-> project = Project.find_by_full_path('namespace/project-name')    # Get the project instance.
-> Feature.disable(:depend_on_persistent_pipeline_ref, project)     # Disable the feature flag for specific project
-> Feature.disable(:depend_on_persistent_pipeline_ref)              # Disable the feature flag system-wide
-```
+This document was moved to [another location](pipelines/index.md).
diff --git a/doc/ci/pipelines/img/collapsible_log_v12_6.png b/doc/ci/pipelines/img/collapsible_log_v12_6.png
new file mode 100644
index 00000000000..24b2c83f7c1
Binary files /dev/null and b/doc/ci/pipelines/img/collapsible_log_v12_6.png differ
diff --git a/doc/ci/pipelines/img/job_failure_reason.png b/doc/ci/pipelines/img/job_failure_reason.png
new file mode 100644
index 00000000000..d44b8e6d1be
Binary files /dev/null and b/doc/ci/pipelines/img/job_failure_reason.png differ
diff --git a/doc/ci/pipelines/img/manual_job_variables.png b/doc/ci/pipelines/img/manual_job_variables.png
new file mode 100644
index 00000000000..a5ed351fdcd
Binary files /dev/null and b/doc/ci/pipelines/img/manual_job_variables.png differ
diff --git a/doc/ci/pipelines/img/pipeline-delete.png b/doc/ci/pipelines/img/pipeline-delete.png
new file mode 100644
index 00000000000..d9dba1f455d
Binary files /dev/null and b/doc/ci/pipelines/img/pipeline-delete.png differ
diff --git a/doc/ci/pipelines/img/pipeline_incremental_rollout.png b/doc/ci/pipelines/img/pipeline_incremental_rollout.png
new file mode 100644
index 00000000000..b3498e9a5a5
Binary files /dev/null and b/doc/ci/pipelines/img/pipeline_incremental_rollout.png differ
diff --git a/doc/ci/pipelines/img/pipelines.png b/doc/ci/pipelines/img/pipelines.png
new file mode 100644
index 00000000000..a604fcb2587
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines.png differ
diff --git a/doc/ci/pipelines/img/pipelines_duration_chart.png b/doc/ci/pipelines/img/pipelines_duration_chart.png
new file mode 100644
index 00000000000..0be7539ba0a
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_duration_chart.png differ
diff --git a/doc/ci/pipelines/img/pipelines_grouped.png b/doc/ci/pipelines/img/pipelines_grouped.png
new file mode 100644
index 00000000000..82814754747
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_grouped.png differ
diff --git a/doc/ci/pipelines/img/pipelines_index.png b/doc/ci/pipelines/img/pipelines_index.png
new file mode 100644
index 00000000000..e168e7e23df
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_index.png differ
diff --git a/doc/ci/pipelines/img/pipelines_mini_graph.png b/doc/ci/pipelines/img/pipelines_mini_graph.png
new file mode 100644
index 00000000000..8656b02f60d
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_mini_graph.png differ
diff --git a/doc/ci/pipelines/img/pipelines_mini_graph_simple.png b/doc/ci/pipelines/img/pipelines_mini_graph_simple.png
new file mode 100644
index 00000000000..d00a8313088
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_mini_graph_simple.png differ
diff --git a/doc/ci/pipelines/img/pipelines_mini_graph_sorting.png b/doc/ci/pipelines/img/pipelines_mini_graph_sorting.png
new file mode 100644
index 00000000000..3a4e5453360
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_mini_graph_sorting.png differ
diff --git a/doc/ci/pipelines/img/pipelines_settings_badges.png b/doc/ci/pipelines/img/pipelines_settings_badges.png
new file mode 100644
index 00000000000..3bdc6374c15
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_settings_badges.png differ
diff --git a/doc/ci/pipelines/img/pipelines_settings_test_coverage.png b/doc/ci/pipelines/img/pipelines_settings_test_coverage.png
new file mode 100644
index 00000000000..13ed69be810
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_settings_test_coverage.png differ
diff --git a/doc/ci/pipelines/img/pipelines_success_chart.png b/doc/ci/pipelines/img/pipelines_success_chart.png
new file mode 100644
index 00000000000..10602b75eeb
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_success_chart.png differ
diff --git a/doc/ci/pipelines/img/pipelines_test_coverage_build.png b/doc/ci/pipelines/img/pipelines_test_coverage_build.png
new file mode 100644
index 00000000000..7eaba1a256f
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_test_coverage_build.png differ
diff --git a/doc/ci/pipelines/img/pipelines_test_coverage_mr_widget.png b/doc/ci/pipelines/img/pipelines_test_coverage_mr_widget.png
new file mode 100644
index 00000000000..fbcd612f3f2
Binary files /dev/null and b/doc/ci/pipelines/img/pipelines_test_coverage_mr_widget.png differ
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
new file mode 100644
index 00000000000..a823793a995
--- /dev/null
+++ b/doc/ci/pipelines/index.md
@@ -0,0 +1,566 @@
+---
+type: reference
+---
+
+# Creating and using CI/CD pipelines
+
+> Introduced in GitLab 8.8.
+
+NOTE: **Tip:**
+Watch our
+["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
+webcast to see a comprehensive demo of GitLab CI/CD pipeline.
+
+## Introduction
+
+Pipelines are the top-level component of continuous integration, delivery, and deployment.
+
+Pipelines comprise:
+
+- Jobs that define what to run. For example, code compilation or test runs.
+- Stages that define when and how to run. For example, that tests run only after code compilation.
+
+Multiple jobs in the same stage are executed by [Runners](../runners/README.md) in parallel, if there are enough concurrent [Runners](../runners/README.md).
+
+If all the jobs in a stage:
+
+- Succeed, the pipeline moves on to the next stage.
+- Fail, the next stage is not (usually) executed and the pipeline ends early.
+
+NOTE: **Note:**
+If you have a [mirrored repository that GitLab pulls from](../../user/project/repository/repository_mirroring.md#pulling-from-a-remote-repository-starter),
+you may need to enable pipeline triggering in your project's
+**Settings > Repository > Pull from a remote repository > Trigger pipelines for mirror updates**.
+
+### Simple pipeline example
+
+As an example, imagine a pipeline consisting of four stages, executed in the following order:
+
+- `build`, with a job called `compile`.
+- `test`, with two jobs called `test` and `test2`.
+- `staging`, with a job called `deploy-to-stage`.
+- `production`, with a job called `deploy-to-prod`.
+
+## Visualizing pipelines
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/5742) in GitLab 8.11.
+
+Pipelines can be complex structures with many sequential and parallel jobs.
+
+To make it easier to understand the flow of a pipeline, GitLab has pipeline graphs for viewing pipelines
+and their statuses.
+
+Pipeline graphs can be displayed in two different ways, depending on the page you
+access the graph from.
+
+NOTE: **Note:**
+GitLab capitalizes the stages' names when shown in the pipeline graphs (below).
+
+### Regular pipeline graphs
+
+Regular pipeline graphs show the names of the jobs of each stage. Regular pipeline graphs can
+be found when you are on a [single pipeline page](#accessing-pipelines). For example:
+
+![Pipelines example](img/pipelines.png)
+
+### Pipeline mini graphs
+
+Pipeline mini graphs take less space and can tell you at a
+quick glance if all jobs passed or something failed. The pipeline mini graph can
+be found when you navigate to:
+
+- The pipelines index page.
+- A single commit page.
+- A merge request page.
+
+Pipeline mini graphs allow you to see all related jobs for a single commit and the net result
+of each stage of your pipeline. This allows you to quickly see what failed and
+fix it.
+
+Stages in pipeline mini graphs are collapsible. Hover your mouse over them and click to expand their jobs.
+
+| Mini graph                                                   | Mini graph expanded                                            |
+|:-------------------------------------------------------------|:---------------------------------------------------------------|
+| ![Pipelines mini graph](img/pipelines_mini_graph_simple.png) | ![Pipelines mini graph extended](img/pipelines_mini_graph.png) |
+
+### Job ordering in pipeline graphs
+
+Job ordering depends on the type of pipeline graph. For [regular pipeline graphs](#regular-pipeline-graphs), jobs are sorted by name.
+
+For [pipeline mini graphs](#pipeline-mini-graphs) ([introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9760)
+in GitLab 9.0), jobs are sorted by severity and then by name.
+
+The order of severity is:
+
+- failed
+- warning
+- pending
+- running
+- manual
+- scheduled
+- canceled
+- success
+- skipped
+- created
+
+For example:
+
+![Pipeline mini graph sorting](img/pipelines_mini_graph_sorting.png)
+
+### Expanding and collapsing job log sections
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/14664) in GitLab
+> 12.0.
+
+Job logs are divided into sections that can be collapsed or expanded. Each section will display
+the duration.
+
+In the following example:
+
+- Two sections are collapsed and can be expanded.
+- Three sections are expanded and can be collapsed.
+
+![Collapsible sections](img/collapsible_log_v12_6.png)
+
+#### Custom collapsible sections
+
+You can create collapsible sections in job logs by manually outputting special codes
+that GitLab will use to determine what sections to collapse:
+
+- Section start marker: `section_start:UNIX_TIMESTAMP:SECTION_NAME\r\e[0K` + `TEXT_OF_SECTION_HEADER`
+- Section end marker: `section_end:UNIX_TIMESTAMP:SECTION_NAME\r\e[0K`
+
+You must add these codes to the script section of the CI configuration. For example,
+using `echo`:
+
+```yaml
+job1:
+  script:
+    - echo -e "section_start:`date +%s`:my_first_section\r\e[0KHeader of the 1st collapsible section"
+    - echo 'this line should be hidden when collapsed'
+    - echo -e "section_end:`date +%s`:my_first_section\r\e[0K"
+```
+
+In the example above:
+
+- `date +%s`: The Unix timestamp (for example `1560896352`).
+- `my_first_section`: The name given to the section.
+- `\r\e[0K`: Prevents the section markers from displaying in the rendered (colored)
+  job log, but they are displayed in the raw job log. To see them, in the top right
+  of the job log, click **{doc-text}** (**Show complete raw**).
+  - `\r`: carriage return.
+  - `\e[0K`: clear line ANSI escape code.
+
+Sample raw job log:
+
+```plaintext
+section_start:1560896352:my_first_section\r\e[0KHeader of the 1st collapsible section
+this line should be hidden when collapsed
+section_end:1560896353:my_first_section\r\e[0K
+```
+
+### Pipeline success and duration charts
+
+> - Introduced in GitLab 3.1.1 as Commit Stats, and later renamed to Pipeline Charts.
+> - [Renamed](https://gitlab.com/gitlab-org/gitlab/issues/38318) to CI / CD Analytics in GitLab 12.8.
+
+GitLab tracks the history of your pipeline successes and failures, as well as how long each pipeline ran. To view this information, go to **Analytics > CI / CD Analytics**.
+
+View successful pipelines:
+
+![Successful pipelines](img/pipelines_success_chart.png)
+
+View pipeline duration history:
+
+![Pipeline duration](img/pipelines_duration_chart.png)
+
+## Pipeline quotas
+
+Each user has a personal pipeline quota that tracks the usage of shared runners in all personal projects.
+Each group has a [usage quota](../../subscriptions/index.md#ci-pipeline-minutes) that tracks the usage of shared runners for all projects created within the group.
+
+When a pipeline is triggered, regardless of who triggered it, the pipeline quota for the project owner's [namespace](../../user/group/index.md#namespaces) is used. In this case, the namespace can be the user or group that owns the project.
+
+### How pipeline duration is calculated
+
+Total running time for a given pipeline excludes retries and pending
+(queued) time.
+
+Each job is represented as a `Period`, which consists of:
+
+- `Period#first` (when the job started).
+- `Period#last` (when the job finished).
+
+A simple example is:
+
+- A (1, 3)
+- B (2, 4)
+- C (6, 7)
+
+In the example:
+
+- A begins at 1 and ends at 3.
+- B begins at 2 and ends at 4.
+- C begins at 6 and ends at 7.
+
+Visually, it can be viewed as:
+
+```text
+0  1  2  3  4  5  6  7
+   AAAAAAA
+      BBBBBBB
+                  CCCC
+```
+
+The union of A, B, and C is (1, 4) and (6, 7). Therefore, the total running time is:
+
+```text
+(4 - 1) + (7 - 6) => 4
+```
+
+## Configuring pipelines
+
+Pipelines, and their component jobs and stages, are defined in the [`.gitlab-ci.yml`](../yaml/README.md) file for each project.
+
+In particular:
+
+- Jobs are the [basic configuration](../yaml/README.md#introduction) component.
+- Stages are defined using the [`stages`](../yaml/README.md#stages) keyword.
+
+For all available configuration options, see the [GitLab CI/CD Pipeline Configuration Reference](../yaml/README.md).
+
+### Settings and schedules
+
+In addition to configuring jobs through `.gitlab-ci.yml`, additional configuration options are available
+through the GitLab UI:
+
+- Pipeline settings for each project. For more information, see [Pipeline settings](settings.md).
+- Schedules for pipelines. For more information, see [Pipeline schedules](schedules.md).
+
+### Grouping jobs
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/6242) in GitLab 8.12.
+
+If you have many similar jobs, your [pipeline graph](#visualizing-pipelines) becomes long and hard
+to read.
+
+For that reason, similar jobs can automatically be grouped together.
+If the job names are formatted in certain ways, they will be collapsed into
+a single group in regular pipeline graphs (not the mini graphs).
+
+You'll know when a pipeline has grouped jobs if you don't see the retry or
+cancel button inside them. Hovering over them will show the number of grouped
+jobs. Click to expand them.
+
+![Grouped pipelines](img/pipelines_grouped.png)
+
+#### Configuring grouping
+
+In the pipeline [configuration file](../yaml/README.md), job names must include two numbers separated with one of
+the following (you can even use them interchangeably):
+
+- A space.
+- A slash (`/`).
+- A colon (`:`).
+
+NOTE: **Note:**
+More specifically, it uses [this](https://gitlab.com/gitlab-org/gitlab/blob/2f3dc314f42dbd79813e6251792853bc231e69dd/app/models/commit_status.rb#L99) regular expression: `\d+[\s:\/\\]+\d+\s*`.
+
+#### How grouping works
+
+The jobs will be ordered by comparing those two numbers from left to right. You
+usually want the first to be the index and the second the total.
+
+For example, the following jobs will be grouped under a job named `test`:
+
+- `test 0 3`
+- `test 1 3`
+- `test 2 3`
+
+The following jobs will be grouped under a job named `test ruby`:
+
+- `test 1:2 ruby`
+- `test 2:2 ruby`
+
+The following jobs will be grouped under a job named `test ruby` as well:
+
+- `1/3 test ruby`
+- `2/3 test ruby`
+- `3/3 test ruby`
+
+### Pipelines for merge requests
+
+GitLab supports configuring pipelines that run only for merge requests. For more information, see
+[Pipelines for merge requests](../merge_request_pipelines/index.md).
+
+### Badges
+
+Pipeline status and test coverage report badges are available and configurable for each project.
+
+For information on adding pipeline badges to projects, see [Pipeline badges](settings.md#pipeline-badges).
+
+## Multi-project pipelines
+
+Pipelines for different projects can be combined together into [Multi-project pipelines](../multi_project_pipelines.md).
+
+[Multi-project pipeline graphs](../multi_project_pipelines.md#multi-project-pipeline-visualization-premium) help
+you visualize the entire pipeline, including all cross-project inter-dependencies. **(PREMIUM)**
+
+## Parent-child pipelines
+
+Complex pipelines can be broken down into one parent pipeline that can trigger
+multiple child sub-pipelines, which all run in the same project and with the same SHA.
+
+For more information, see [Parent-Child pipelines](../parent_child_pipelines.md).
+
+## Working with pipelines
+
+In general, pipelines are executed automatically and require no intervention once created.
+
+However, there are instances where you'll need to interact with pipelines. These are documented below.
+
+### Manually executing pipelines
+
+Pipelines can be manually executed, with predefined or manually-specified [variables](../variables/README.md).
+
+You might do this if the results of a pipeline (for example, a code build) is required outside the normal
+operation of the pipeline.
+
+To execute a pipeline manually:
+
+1. Navigate to your project's **CI/CD > Pipelines**.
+1. Click on the **Run Pipeline** button.
+1. On the **Run Pipeline** page:
+    1. Select the branch to run the pipeline for in the **Create for** field.
+    1. Enter any [environment variables](../variables/README.md) required for the pipeline run.
+    1. Click the **Create pipeline** button.
+
+The pipeline will execute the jobs as configured.
+
+#### Using a query string
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/24146) in GitLab 12.5.
+
+Variables on the **Run Pipeline** page can be pre-populated by passing variable keys and values
+in a query string appended to the `pipelines/new` URL. The format is:
+
+```plaintext
+.../pipelines/new?ref=<branch>&var[<variable_key>]=<value>&file_var[<file_key>]=<value>
+```
+
+The following parameters are supported:
+
+- `ref`: specify the branch to populate the **Run for** field with.
+- `var`: specify a `Variable` variable.
+- `file_var`: specify a `File` variable.
+
+For each `var` or `file_var`, a key and value are required.
+
+For example, the query string
+`.../pipelines/new?ref=my_branch&var[foo]=bar&file_var[file_foo]=file_bar` will pre-populate the
+**Run Pipeline** page as follows:
+
+- **Run for** field: `my_branch`.
+- **Variables** section:
+  - Variable:
+    - Key: `foo`
+    - Value: `bar`
+  - File:
+    - Key: `file_foo`
+    - Value: `file_bar`
+
+### Accessing pipelines
+
+You can find the current and historical pipeline runs under your project's
+**CI/CD > Pipelines** page. You can also access pipelines for a merge request by navigating
+to its **Pipelines** tab.
+
+![Pipelines index page](img/pipelines_index.png)
+
+Clicking on a pipeline will bring you to the **Pipeline Details** page and show
+the jobs that were run for that pipeline. From here you can cancel a running pipeline,
+retry jobs on a failed pipeline, or [delete a pipeline](#deleting-a-single-pipeline).
+
+### Accessing individual jobs
+
+When you access a pipeline, you can see the related jobs for that pipeline.
+
+Clicking on an individual job will show you its job log, and allow you to:
+
+- Cancel the job.
+- Retry the job.
+- Erase the job log.
+
+### Seeing the failure reason for jobs
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17782) in GitLab 10.7.
+
+When a pipeline fails or is allowed to fail, there are several places where you
+can quickly check the reason it failed:
+
+- In the pipeline graph, on the pipeline detail view.
+- In the pipeline widgets, in the merge requests and commit pages.
+- In the job views, in the global and detailed views of a job.
+
+In each place, if you hover over the failed job you can see the reason it failed.
+
+![Pipeline detail](img/job_failure_reason.png)
+
+From [GitLab 10.8](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17814),
+you can also see the reason it failed on the Job detail page.
+
+### Manual actions from pipeline graphs
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/7931) in GitLab 8.15.
+
+Manual actions, configured using the [`when:manual`](../yaml/README.md#whenmanual) parameter,
+allow you to require manual interaction before moving forward in the pipeline.
+
+You can do this straight from the pipeline graph. Just click on the play button
+to execute that particular job.
+
+For example, your pipeline start automatically, but require manual action to
+[deploy to production](../environments.md#configuring-manual-deployments). In the example below, the `production`
+stage has a job with a manual action.
+
+![Pipelines example](img/pipelines.png)
+
+### Specifying variables when running manual jobs
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/30485) in GitLab 12.2.
+
+When running manual jobs you can supply additional job specific variables.
+
+You can do this from the job page of the manual job you want to run with
+additional variables.
+
+This is useful when you want to alter the execution of a job by using
+environment variables.
+
+![Manual job variables](img/manual_job_variables.png)
+
+### Delay a job in a pipeline graph
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/21767) in GitLab 11.4.
+
+When you do not want to run a job immediately, you can use the [`when:delayed`](../yaml/README.md#whendelayed) parameter to
+delay a job's execution for a certain period.
+
+This is especially useful for timed incremental rollout where new code is rolled out gradually.
+
+For example, if you start rolling out new code and:
+
+- Users do not experience trouble, GitLab can automatically complete the deployment from 0% to 100%.
+- Users experience trouble with the new code, you can stop the timed incremental rollout by canceling the pipeline
+  and [rolling](../environments.md#retrying-and-rolling-back) back to the last stable version.
+
+![Pipelines example](img/pipeline_incremental_rollout.png)
+
+### Using the API
+
+GitLab provides API endpoints to:
+
+- Perform basic functions. For more information, see [Pipelines API](../../api/pipelines.md).
+- Maintain pipeline schedules. For more information, see [Pipeline schedules API](../../api/pipeline_schedules.md).
+- Trigger pipeline runs. For more information, see:
+  - [Triggering pipelines through the API](../triggers/README.md).
+  - [Pipeline triggers API](../../api/pipeline_triggers.md).
+
+### Start multiple manual actions in a stage
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/27188) in GitLab 11.11.
+
+Multiple manual actions in a single stage can be started at the same time using the "Play all manual" button.
+Once the user clicks this button, each individual manual action will be triggered and refreshed
+to an updated status.
+
+This functionality is only available:
+
+- For users with at least Developer access.
+- If the the stage contains [manual actions](#manual-actions-from-pipeline-graphs).
+
+### Deleting a single pipeline
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/24851) in GitLab 12.7.
+
+Users with [owner permissions](../../user/permissions.md) in a project can delete a pipeline
+by clicking on the pipeline in the **CI/CD > Pipelines** to get to the **Pipeline Details**
+page, then using the **Delete** button.
+
+![Pipeline Delete Button](img/pipeline-delete.png)
+
+CAUTION: **Warning:**
+Deleting a pipeline will expire all pipeline caches, and delete all related objects,
+such as builds, logs, artifacts, and triggers. **This action cannot be undone.**
+
+## Most Recent Pipeline
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/50499) in GitLab 12.3.
+
+There's a link to the latest pipeline for the last commit of a given branch at `/project/pipelines/[branch]/latest`. Also, `/project/pipelines/latest` will redirect you to the latest pipeline for the last commit on the project's default branch.
+
+## Security on protected branches
+
+A strict security model is enforced when pipelines are executed on
+[protected branches](../../user/project/protected_branches.md).
+
+The following actions are allowed on protected branches only if the user is
+[allowed to merge or push](../../user/project/protected_branches.md#using-the-allowed-to-merge-and-allowed-to-push-settings)
+on that specific branch:
+
+- Run manual pipelines (using the [Web UI](#manually-executing-pipelines) or pipelines API).
+- Run scheduled pipelines.
+- Run pipelines using triggers.
+- Trigger manual actions on existing pipelines.
+- Retry or cancel existing jobs (using the Web UI or pipelines API).
+
+**Variables** marked as **protected** are accessible only to jobs that
+run on protected branches, preventing untrusted users getting unintended access to
+sensitive information like deployment credentials and tokens.
+
+**Runners** marked as **protected** can run jobs only on protected
+branches, avoiding untrusted code to be executed on the protected runner and
+preserving deployment keys and other credentials from being unintentionally
+accessed. In order to ensure that jobs intended to be executed on protected
+runners will not use regular runners, they must be tagged accordingly.
+
+## Persistent pipeline refs
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/17043) in GitLab 12.4.
+
+Previously, you'd have encountered unexpected pipeline failures when you force-pushed
+a branch to its remote repository. To illustrate the problem, suppose you've had the current workflow:
+
+1. A user creates a feature branch named `example` and pushes it to a remote repository.
+1. A new pipeline starts running on the `example` branch.
+1. A user rebases the `example` branch on the latest `master` branch and force-pushes it to its remote repository.
+1. A new pipeline starts running on the `example` branch again, however,
+   the previous pipeline (2) fails because of `fatal: reference is not a tree:` error.
+
+This is because the previous pipeline cannot find a checkout-SHA (which associated with the pipeline record)
+from the `example` branch that the commit history has already been overwritten by the force-push.
+Similarly, [Pipelines for merged results](../merge_request_pipelines/pipelines_for_merged_results/index.md)
+might have failed intermittently due to [the same reason](../merge_request_pipelines/pipelines_for_merged_results/index.md#intermittently-pipelines-fail-by-fatal-reference-is-not-a-tree-error).
+
+As of GitLab 12.4, we've improved this behavior by persisting pipeline refs exclusively.
+To illustrate its life cycle:
+
+1. A pipeline is created on a feature branch named `example`.
+1. A persistent pipeline ref is created at `refs/pipelines/<pipeline-id>`,
+   which retains the checkout-SHA of the associated pipeline record.
+   This persistent ref stays intact during the pipeline execution,
+   even if the commit history of the `example` branch has been overwritten by force-push.
+1. GitLab Runner fetches the persistent pipeline ref and gets source code from the checkout-SHA.
+1. When the pipeline finished, its persistent ref is cleaned up in a background process.
+
+NOTE: **NOTE**: At this moment, this feature is on by default and can be manually disabled
+by disabling `depend_on_persistent_pipeline_ref` feature flag. If you're interested in
+manually disabling this behavior, please ask the administrator
+to execute the following commands in rails console.
+
+```shell
+> sudo gitlab-rails console                                        # Login to Rails console of GitLab instance.
+> project = Project.find_by_full_path('namespace/project-name')    # Get the project instance.
+> Feature.disable(:depend_on_persistent_pipeline_ref, project)     # Disable the feature flag for specific project
+> Feature.disable(:depend_on_persistent_pipeline_ref)              # Disable the feature flag system-wide
+```
diff --git a/doc/ci/pipelines/schedules.md b/doc/ci/pipelines/schedules.md
index ea98638ae53..92cf1985d86 100644
--- a/doc/ci/pipelines/schedules.md
+++ b/doc/ci/pipelines/schedules.md
@@ -12,7 +12,7 @@ Cron notation is parsed by [Fugit](https://github.com/floraison/fugit).
 
 Pipelines are normally run based on certain conditions being met. For example, when a branch is pushed to repository.
 
-Pipeline schedules can be used to also run [pipelines](../pipelines.md) at specific intervals. For example:
+Pipeline schedules can be used to also run [pipelines](index.md) at specific intervals. For example:
 
 - Every month on the 22nd for a certain branch.
 - Once every day.
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md
new file mode 100644
index 00000000000..53a529493d2
--- /dev/null
+++ b/doc/ci/pipelines/settings.md
@@ -0,0 +1,308 @@
+---
+type: reference, howto
+---
+
+# Pipelines settings
+
+To reach the pipelines settings navigate to your project's
+**Settings > CI/CD**.
+
+The following settings can be configured per project.
+
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+For an overview, watch the video [GitLab CI Pipeline, Artifacts, and Environments](https://www.youtube.com/watch?v=PCKDICEe10s).
+Watch also [GitLab CI pipeline tutorial for beginners](https://www.youtube.com/watch?v=Jav4vbUrqII).
+
+## Git strategy
+
+With Git strategy, you can choose the default way your repository is fetched
+from GitLab in a job.
+
+There are two options. Using:
+
+- `git clone`, which is slower since it clones the repository from scratch
+  for every job, ensuring that the local working copy is always pristine.
+- `git fetch`, which is faster as it re-uses the local working copy (falling
+  back to clone if it doesn't exist).
+
+The default Git strategy can be overridden by the [GIT_STRATEGY variable](../yaml/README.md#git-strategy)
+in `.gitlab-ci.yml`.
+
+## Git shallow clone
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/28919) in GitLab 12.0.
+
+NOTE: **Note**:
+As of GitLab 12.0, newly created projects will automatically have a default
+`git depth` value of `50`.
+
+It is possible to limit the number of changes that GitLab CI/CD will fetch when cloning
+a repository. Setting a limit to `git depth` can speed up Pipelines execution. Maximum
+allowed value is `1000`.
+
+To disable shallow clone and make GitLab CI/CD fetch all branches and tags each time,
+keep the value empty or set to `0`.
+
+This value can also be [overridden by `GIT_DEPTH`](../large_repositories/index.md#shallow-cloning) variable in `.gitlab-ci.yml` file.
+
+## Timeout
+
+Timeout defines the maximum amount of time in minutes that a job is able run.
+This is configurable under your project's **Settings > CI/CD > General pipelines settings**.
+The default value is 60 minutes. Decrease the time limit if you want to impose
+a hard limit on your jobs' running time or increase it otherwise. In any case,
+if the job surpasses the threshold, it is marked as failed.
+
+### Timeout overriding on Runner level
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17221) in GitLab 10.7.
+
+Project defined timeout (either specific timeout set by user or the default
+60 minutes timeout) may be [overridden on Runner level](../runners/README.md#setting-maximum-job-timeout-for-a-runner).
+
+## Maximum artifacts size **(CORE ONLY)**
+
+For information about setting a maximum artifact size for a project, see
+[Maximum artifacts size](../../user/admin_area/settings/continuous_integration.md#maximum-artifacts-size-core-only).
+
+## Custom CI configuration path
+
+> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/12509) in GitLab 9.4.
+> - [Support for external `.gitlab-ci.yml` locations](https://gitlab.com/gitlab-org/gitlab/issues/14376) introduced in GitLab 12.6.
+
+By default we look for the `.gitlab-ci.yml` file in the project's root
+directory. If needed, you can specify an alternate path and file name, including locations outside the project.
+
+To customize the path:
+
+1. Go to the project's **Settings > CI / CD**.
+1. Expand the **General pipelines** section.
+1. Provide a value in the **Custom CI configuration path** field.
+1. Click **Save changes**.
+
+If the CI configuration is stored within the repository in a non-default
+location, the path must be relative to the root directory. Examples of valid
+paths and file names include:
+
+- `.gitlab-ci.yml` (default)
+- `.my-custom-file.yml`
+- `my/path/.gitlab-ci.yml`
+- `my/path/.my-custom-file.yml`
+
+If the CI configuration will be hosted on an external site, the URL link must end with `.yml`:
+
+- `http://example.com/generate/ci/config.yml`
+
+If the CI configuration will be hosted in a different project within GitLab, the path must be relative
+to the root directory in the other project, with the group and project name added to the end:
+
+- `.gitlab-ci.yml@mygroup/another-project`
+- `my/path/.my-custom-file.yml@mygroup/another-project`
+
+Hosting the configuration file in a separate project allows stricter control of the
+configuration file. For example:
+
+- Create a public project to host the configuration file.
+- Give write permissions on the project only to users who are allowed to edit the file.
+
+Other users and projects will be able to access the configuration file without being
+able to edit it.
+
+## Test coverage parsing
+
+If you use test coverage in your code, GitLab can capture its output in the
+job log using a regular expression. In the pipelines settings, search for the
+"Test coverage parsing" section.
+
+![Pipelines settings test coverage](img/pipelines_settings_test_coverage.png)
+
+Leave blank if you want to disable it or enter a ruby regular expression. You
+can use <https://rubular.com> to test your regex.
+
+If the pipeline succeeds, the coverage is shown in the merge request widget and
+in the jobs table.
+
+![MR widget coverage](img/pipelines_test_coverage_mr_widget.png)
+
+![Build status coverage](img/pipelines_test_coverage_build.png)
+
+A few examples of known coverage tools for a variety of languages can be found
+in the pipelines settings page.
+
+### Removing color codes
+
+Some test coverage tools output with ANSI color codes that won't be
+parsed correctly by the regular expression and will cause coverage
+parsing to fail.
+
+If your coverage tool doesn't provide an option to disable color
+codes in the output, you can pipe the output of the coverage tool through a
+small one line script that will strip the color codes off.
+
+For example:
+
+```shell
+lein cloverage | perl -pe 's/\e\[?.*?[\@-~]//g'
+```
+
+## Visibility of pipelines
+
+Pipeline visibility is determined by:
+
+- Your current [user access level](../../user/permissions.md).
+- The **Public pipelines** project setting under your project's **Settings > CI/CD > General pipelines**.
+
+NOTE: **Note:**
+If the project visibility is set to **Private**, the [**Public pipelines** setting will have no effect](../enable_or_disable_ci.md#per-project-user-setting).
+
+This also determines the visibility of these related features:
+
+- Job output logs
+- Job artifacts
+- The [pipeline security dashboard](../../user/application_security/security_dashboard/index.md#pipeline-security-dashboard) **(ULTIMATE)**
+
+If **Public pipelines** is enabled (default):
+
+- For **public** projects, anyone can view the pipelines and related features.
+- For **internal** projects, any logged in user can view the pipelines
+  and related features.
+- For **private** projects, any project member (guest or higher) can view the pipelines
+  and related features.
+
+If **Public pipelines** is disabled:
+
+- For **public** projects, anyone can view the pipelines, but only members
+  (reporter or higher) can access the related features.
+- For **internal** projects, any logged in user can view the pipelines.
+  However, only members (reporter or higher) can access the job related features.
+- For **private** projects, only project members (reporter or higher)
+  can view the pipelines or access the related features.
+
+## Auto-cancel pending pipelines
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9362) in GitLab 9.1.
+
+If you want all pending non-HEAD pipelines on branches to auto-cancel each time
+a new pipeline is created, such as after a Git push or manually from the UI,
+you can enable this in the project settings:
+
+1. Go to **{settings}** **Settings > CI / CD**.
+1. Expand **General Pipelines**.
+1. Check the **Auto-cancel redundant, pending pipelines** checkbox.
+1. Click **Save changes**.
+
+## Skip older, pending deployment jobs
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/25276) in GitLab 12.9.
+
+Your project may have multiple concurrent deployment jobs that are
+scheduled to run within the same time frame.
+
+This can lead to a situation where an older deployment job runs after a
+newer one, which may not be what you want.
+
+To avoid this scenario:
+
+1. Go to **{settings}** **Settings > CI / CD**.
+1. Expand **General pipelines**.
+1. Check the **Skip older, pending deployment jobs** checkbox.
+1. Click **Save changes**.
+
+The pending deployment jobs will be skipped.
+
+## Pipeline Badges
+
+In the pipelines settings page you can find pipeline status and test coverage
+badges for your project. The latest successful pipeline will be used to read
+the pipeline status and test coverage values.
+
+Visit the pipelines settings page in your project to see the exact link to
+your badges, as well as ways to embed the badge image in your HTML or Markdown
+pages.
+
+![Pipelines badges](img/pipelines_settings_badges.png)
+
+### Pipeline status badge
+
+Depending on the status of your job, a badge can have the following values:
+
+- pending
+- running
+- passed
+- failed
+- skipped
+- canceled
+- unknown
+
+You can access a pipeline status badge image using the following link:
+
+```text
+https://example.gitlab.com/<namespace>/<project>/badges/<branch>/pipeline.svg
+```
+
+### Test coverage report badge
+
+GitLab makes it possible to define the regular expression for [coverage report](#test-coverage-parsing),
+that each job log will be matched against. This means that each job in the
+pipeline can have the test coverage percentage value defined.
+
+The test coverage badge can be accessed using following link:
+
+```text
+https://example.gitlab.com/<namespace>/<project>/badges/<branch>/coverage.svg
+```
+
+If you would like to get the coverage report from a specific job, you can add
+the `job=coverage_job_name` parameter to the URL. For example, the following
+Markdown code will embed the test coverage report badge of the `coverage` job
+into your `README.md`:
+
+```markdown
+![coverage](https://gitlab.com/gitlab-org/gitlab-foss/badges/master/coverage.svg?job=coverage)
+```
+
+### Badge styles
+
+Pipeline badges can be rendered in different styles by adding the `style=style_name` parameter to the URL. Currently two styles are available:
+
+#### Flat (default)
+
+```text
+https://example.gitlab.com/<namespace>/<project>/badges/<branch>/coverage.svg?style=flat
+```
+
+![Badge flat style](https://gitlab.com/gitlab-org/gitlab-foss/badges/master/coverage.svg?job=coverage&style=flat)
+
+#### Flat square
+
+> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/30120) in GitLab 11.8.
+
+```text
+https://example.gitlab.com/<namespace>/<project>/badges/<branch>/coverage.svg?style=flat-square
+```
+
+![Badge flat square style](https://gitlab.com/gitlab-org/gitlab-foss/badges/master/coverage.svg?job=coverage&style=flat-square)
+
+## Environment Variables
+
+[Environment variables](../variables/README.md#gitlab-cicd-environment-variables) can be set in an environment to be available to a runner.
+
+## Deploy Keys
+
+With Deploy Keys, GitLab allows you to import SSH public keys. You can then have
+read only or read/write access to your project from the machines the keys were generated from.
+
+SSH keys added to your project settings will be used for continuous integration,
+staging, or production servers.
+
+<!-- ## Troubleshooting
+
+Include any troubleshooting steps that you can foresee. If you know beforehand what issues
+one might have when setting this up, or when something is changed, or on upgrading, it's
+important to describe those, too. Think of things that may go wrong and include them here.
+This is important to minimize requests for support, and to avoid doc comments with
+questions that you know someone might ask.
+
+Each scenario can be a third-level heading, e.g. `### Getting error message X`.
+If you have none to add when creating a doc, leave this section in place
+but commented out to help encourage others to add to it in the future. -->
diff --git a/doc/ci/quick_start/README.md b/doc/ci/quick_start/README.md
index 83b3ec44314..0ea37e26224 100644
--- a/doc/ci/quick_start/README.md
+++ b/doc/ci/quick_start/README.md
@@ -23,7 +23,7 @@ that you can consider for use in your project. You may want to familiarize
 yourself with these prior to getting started.
 
 GitLab offers a [continuous integration](https://about.gitlab.com/stages-devops-lifecycle/continuous-integration/) service. For each commit or push to trigger your CI
-[pipeline](../pipelines.md), you must:
+[pipeline](../pipelines/index.md), you must:
 
 - Add a [`.gitlab-ci.yml` file](#creating-a-gitlab-ciyml-file) to your repository's root directory.
 - Ensure your project is configured to use a [Runner](#configuring-a-runner).
diff --git a/doc/ci/runners/README.md b/doc/ci/runners/README.md
index 91b4000b74a..7e1aae4709a 100644
--- a/doc/ci/runners/README.md
+++ b/doc/ci/runners/README.md
@@ -422,4 +422,4 @@ You can find the IP address of a Runner for a specific project by:
 [register]: https://docs.gitlab.com/runner/register/
 [protected branches]: ../../user/project/protected_branches.md
 [protected tags]: ../../user/project/protected_tags.md
-[project defined timeout]: ../../user/project/pipelines/settings.html#timeout
+[project defined timeout]: ../pipelines/settings.md#timeout
diff --git a/doc/ci/ssh_keys/README.md b/doc/ci/ssh_keys/README.md
index 804970e08f2..b3a97d34575 100644
--- a/doc/ci/ssh_keys/README.md
+++ b/doc/ci/ssh_keys/README.md
@@ -37,7 +37,7 @@ with any type of [executor](https://docs.gitlab.com/runner/executors/)
 NOTE: **Note:**
 The private key will not be displayed in the job log, unless you enable
 [debug logging](../variables/README.md#debug-logging). You might also want to
-check the [visibility of your pipelines](../../user/project/pipelines/settings.md#visibility-of-pipelines).
+check the [visibility of your pipelines](../pipelines/settings.md#visibility-of-pipelines).
 
 ## SSH keys when using the Docker executor
 
diff --git a/doc/ci/variables/README.md b/doc/ci/variables/README.md
index cbc6b9947b3..5a6d30a1079 100644
--- a/doc/ci/variables/README.md
+++ b/doc/ci/variables/README.md
@@ -169,7 +169,7 @@ You can either set the variable directly in the `.gitlab-ci.yml`
 file or through the UI.
 
 NOTE: **Note:**
-It is possible to [specify variables when running manual jobs](../pipelines.md#specifying-variables-when-running-manual-jobs).
+It is possible to [specify variables when running manual jobs](../pipelines/index.md#specifying-variables-when-running-manual-jobs).
 
 #### Via `.gitlab-ci.yml`
 
@@ -185,14 +185,19 @@ For a deeper look into them, see [`.gitlab-ci.yml` defined variables](#gitlab-ci
 
 #### Via the UI
 
-From the UI, navigate to your project's **Settings > CI/CD** and
-expand **Variables**. Create a new variable by choosing its **type**, naming
-it in the field **Input variable key**, and defining its value in the
-**Input variable value** field:
+From within the UI, you can add or update custom environment variables:
 
-![CI/CD settings - new variable](img/new_custom_variables_example.png)
+1. Go to your project's **Settings > CI/CD** and expand the **Variables** section.
+1. Click the **Add variable** button. In the **Add variable** modal, fill in the details:
 
-You'll also see the option to mask and/or protect your variables.
+    - **Key**: Must be one line, with no spaces, using only letters, numbers, `-` or `_`.
+    - **Value**: No limitations.
+    - **Type**: `File` or `Variable`.
+    - **Environment scope**: `All`, or specific environments.
+    - **Protect variable** (Optional): If selected, the variable will only be available in pipelines that run on protected branches or tags.
+    - **Mask variable** (Optional): If selected, the variable's **Value** will be masked in job logs. The variable will fail to save if the value does not meet the [masking requirements](#masked-variables).
+
+After a variable is created, you can update any of the details by clicking on the **{pencil}** **Edit** button.
 
 Once you've set the variables, call them from the `.gitlab-ci.yml` file:
 
@@ -460,7 +465,7 @@ limitations with the current Auto DevOps scripting environment.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/44059) in GitLab 10.8.
 
-[Manually triggered pipelines](../pipelines.md#manually-executing-pipelines) allow you to override the value of a current variable.
+[Manually triggered pipelines](../pipelines/index.md#manually-executing-pipelines) allow you to override the value of a current variable.
 
 For instance, suppose you added a
 [custom variable `$TEST`](#creating-a-custom-environment-variable)
@@ -616,7 +621,7 @@ variables that were set, etc.
 
 Before enabling this, you should ensure jobs are visible to
 [team members only](../../user/permissions.md#project-features). You should
-also [erase](../pipelines.md#accessing-individual-jobs) all generated job logs
+also [erase](../pipelines/index.md#accessing-individual-jobs) all generated job logs
 before making them visible again.
 
 To enable debug logs (traces), set the `CI_DEBUG_TRACE` variable to `true`:
diff --git a/doc/ci/variables/img/new_custom_variables_example.png b/doc/ci/variables/img/new_custom_variables_example.png
deleted file mode 100644
index bb60e6bab21..00000000000
Binary files a/doc/ci/variables/img/new_custom_variables_example.png and /dev/null differ
diff --git a/doc/ci/yaml/README.md b/doc/ci/yaml/README.md
index e0c41d821a6..9224d73b58b 100644
--- a/doc/ci/yaml/README.md
+++ b/doc/ci/yaml/README.md
@@ -4,7 +4,7 @@ type: reference
 
 # GitLab CI/CD Pipeline Configuration Reference
 
-GitLab CI/CD [pipelines](../pipelines.md) are configured using a YAML file called `.gitlab-ci.yml` within each project.
+GitLab CI/CD [pipelines](../pipelines/index.md) are configured using a YAML file called `.gitlab-ci.yml` within each project.
 
 The `.gitlab-ci.yml` file defines the structure and order of the pipelines and determines:
 
@@ -2735,7 +2735,7 @@ test:
 ```
 
 The job-level timeout can exceed the
-[project-level timeout](../../user/project/pipelines/settings.md#timeout) but can not
+[project-level timeout](../pipelines/settings.md#timeout) but can not
 exceed the Runner-specific timeout.
 
 ### `parallel`
@@ -2906,7 +2906,7 @@ starting, at the cost of reduced parallelization.
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/23464) in GitLab 12.3.
 
 `interruptible` is used to indicate that a job should be canceled if made redundant by a newer pipeline run. Defaults to `false`.
-This value will only be used if the [automatic cancellation of redundant pipelines feature](../../user/project/pipelines/settings.md#auto-cancel-pending-pipelines)
+This value will only be used if the [automatic cancellation of redundant pipelines feature](../pipelines/settings.md#auto-cancel-pending-pipelines)
 is enabled.
 
 When enabled, a pipeline on the same branch will be canceled when:
diff --git a/doc/development/api_graphql_styleguide.md b/doc/development/api_graphql_styleguide.md
index 7d884737f5b..9e419be9419 100644
--- a/doc/development/api_graphql_styleguide.md
+++ b/doc/development/api_graphql_styleguide.md
@@ -21,6 +21,12 @@ and in [PDF](https://gitlab.com/gitlab-org/create-stage/uploads/8e78ea7f326b2ef6
 Everything covered in this deep dive was accurate as of GitLab 11.9, and while specific
 details may have changed since then, it should still serve as a good introduction.
 
+## GraphiQL
+
+GraphiQL is an interactive GraphQL API explorer where you can play around with existing queries.
+You can access it in any GitLab environment on `https://<your-gitlab-site.com>/-/graphql-explorer`.
+For example, the one for [GitLab.com](https://gitlab.com/-/graphql-explorer).
+
 ## Authentication
 
 Authentication happens through the `GraphqlController`, right now this
@@ -335,7 +341,7 @@ field :id, GraphQL::ID_TYPE, description: 'ID of the resource'
 
 Descriptions of fields and arguments are viewable to users through:
 
-- The [GraphiQL explorer](../api/graphql/#graphiql).
+- The [GraphiQL explorer](#graphiql).
 - The [static GraphQL API reference](../api/graphql/#reference).
 
 ### Description styleguide
diff --git a/doc/development/logging.md b/doc/development/logging.md
index a90d78ba8d9..f10737da766 100644
--- a/doc/development/logging.md
+++ b/doc/development/logging.md
@@ -112,20 +112,57 @@ importer progresses. Here's what to do:
    all messages might have `current_user_id` and `project_id` to make it easier
    to search for activities by user for a given time.
 
-1. Do NOT mix and match types. Elasticsearch won't be able to index your
-   logs properly if you [mix integer and string
-   types](https://www.elastic.co/guide/en/elasticsearch/guide/current/mapping.html#_avoiding_type_gotchas):
+#### Implicit schema for JSON logging
+
+When using something like Elasticsearch to index structured logs, there is a
+schema for the types of each log field (even if that schema is implicit /
+inferred). It's important to be consistent with the types of your field values,
+otherwise this might break the ability to search/filter on these fields, or even
+cause whole log events to be dropped. While much of this section is phrased in
+an Elasticsearch-specific way, the concepts should translate to many systems you
+might use to index structured logs. GitLab.com uses Elasticsearch to index log
+data.
+
+Unless a field type is explicitly mapped, Elasticsearch will infer the type from
+the first instance of that field value it sees. Subsequent instances of that
+field value with different types will either fail to be indexed, or in some
+cases (scalar/object conflict), the whole log line will be dropped.
+
+GitLab.com's logging Elasticsearch sets
+[`ignore_malformed`](https://www.elastic.co/guide/en/elasticsearch/reference/current/ignore-malformed.html),
+which allows documents to be indexed even when there are simpler sorts of
+mapping conflict (for example, number / string), although indexing on the affected fields
+will break.
+
+Examples:
 
-   ```ruby
-   # BAD
-   logger.info(message: "Import error", error: 1)
-   logger.info(message: "Import error", error: "I/O failure")
-   ```
+```ruby
+# GOOD
+logger.info(message: "Import error", error_code: 1, error: "I/O failure")
 
-   ```ruby
-   # GOOD
-   logger.info(message: "Import error", error_code: 1, error: "I/O failure")
-   ```
+# BAD
+logger.info(message: "Import error", error: 1)
+logger.info(message: "Import error", error: "I/O failure")
+
+# WORST
+logger.info(message: "Import error", error: "I/O failure")
+logger.info(message: "Import error", error: { message: "I/O failure" })
+```
+
+List elements must be the same type:
+
+```ruby
+# GOOD
+logger.info(a_list: ["foo", "1", "true"])
+
+# BAD
+logger.info(a_list: ["foo", 1, true])
+```
+
+Resources:
+
+- [Elasticsearch mapping - avoiding type gotchas](https://www.elastic.co/guide/en/elasticsearch/guide/current/mapping.html#_avoiding_type_gotchas)
+- [Elasticsearch mapping types]( https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html)
 
 ## Multi-destination Logging
 
diff --git a/doc/development/migration_style_guide.md b/doc/development/migration_style_guide.md
index 3f202115b4c..776ac252b76 100644
--- a/doc/development/migration_style_guide.md
+++ b/doc/development/migration_style_guide.md
@@ -176,9 +176,15 @@ Removing a column:
 ```ruby
 include Gitlab::Database::MigrationHelpers
 
-def change
+def up
   with_lock_retries do
-    remove_column :users, :full_name, :string
+    remove_column :users, :full_name
+  end
+end
+
+def down
+  with_lock_retries do
+    add_column :users, :full_name, :string
   end
 end
 ```
@@ -188,11 +194,17 @@ Removing a foreign key:
 ```ruby
 include Gitlab::Database::MigrationHelpers
 
-def change
+def up
   with_lock_retries do
     remove_foreign_key :issues, :projects
   end
 end
+
+def down
+  with_lock_retries do
+    add_foreign_key :issues, :projects
+  end
+end
 ```
 
 Changing default value for a column:
@@ -200,11 +212,17 @@ Changing default value for a column:
 ```ruby
 include Gitlab::Database::MigrationHelpers
 
-def change
+def up
   with_lock_retries do
     change_column_default :merge_requests, :lock_version, from: nil, to: 0
   end
 end
+
+def down
+  with_lock_retries do
+    change_column_default :merge_requests, :lock_version, from: 0, to: nil
+  end
+end
 ```
 
 ### When to use the helper method
@@ -231,6 +249,8 @@ Example changes:
 
 **Note:** `with_lock_retries` method **cannot** be used with `disable_ddl_transaction!`.
 
+**Note:** `with_lock_retries` method **cannot** be used within the `change` method, you must manually define the `up` and `down` methods to make the migration reversible.
+
 ### How the helper method works
 
 1. Iterate 50 times.
diff --git a/doc/subscriptions/index.md b/doc/subscriptions/index.md
index 941e83782b2..0ca05fe0cda 100644
--- a/doc/subscriptions/index.md
+++ b/doc/subscriptions/index.md
@@ -354,7 +354,7 @@ features, and the instance will be read / write again.
 
 ## CI pipeline minutes
 
-CI pipeline minutes are the execution time for your [pipelines](../ci/pipelines.md) on GitLab's shared runners. Each [GitLab.com tier](https://about.gitlab.com/pricing/) includes a monthly quota of CI pipeline minutes.
+CI pipeline minutes are the execution time for your [pipelines](../ci/pipelines/index.md) on GitLab's shared runners. Each [GitLab.com tier](https://about.gitlab.com/pricing/) includes a monthly quota of CI pipeline minutes.
 
 Quotas apply to:
 
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 4e75102d808..50b2fbeaa60 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -1375,7 +1375,7 @@ increasing the rollout up to 100%.
 
 If `INCREMENTAL_ROLLOUT_MODE` is set to `manual` in your project, then instead
 of the standard `production` job, 4 different
-[manual jobs](../../ci/pipelines.md#manual-actions-from-pipeline-graphs)
+[manual jobs](../../ci/pipelines/index.md#manual-actions-from-pipeline-graphs)
 will be created:
 
 1. `rollout 10%`
diff --git a/doc/user/admin_area/settings/continuous_integration.md b/doc/user/admin_area/settings/continuous_integration.md
index bdb5125e5aa..1244f0da0e9 100644
--- a/doc/user/admin_area/settings/continuous_integration.md
+++ b/doc/user/admin_area/settings/continuous_integration.md
@@ -53,7 +53,7 @@ To change it at the:
   1. Change the value of **maximum artifacts size (in MB)**.
   1. Press **Save changes** for the changes to take effect.
 
-- [Project level](../../project/pipelines/settings.md) (this will override the instance and group settings):
+- [Project level](../../../ci/pipelines/settings.md) (this will override the instance and group settings):
 
   1. Go to the project's **Settings > CI / CD > General Pipelines**.
   1. Change the value of **maximum artifacts size (in MB)**.
@@ -152,7 +152,7 @@ Area of your GitLab instance (`.gitlab-ci.yml` if not set):
 1. Input the new path in the **Default CI configuration path** field.
 1. Hit **Save changes** for the changes to take effect.
 
-It is also possible to specify a [custom CI configuration path for a specific project](../../project/pipelines/settings.md#custom-ci-configuration-path).
+It is also possible to specify a [custom CI configuration path for a specific project](../../../ci/pipelines/settings.md#custom-ci-configuration-path).
 
 <!-- ## Troubleshooting
 
diff --git a/doc/user/application_security/configuration/index.md b/doc/user/application_security/configuration/index.md
index da36d7ff95c..131247910ab 100644
--- a/doc/user/application_security/configuration/index.md
+++ b/doc/user/application_security/configuration/index.md
@@ -13,7 +13,7 @@ features and can be accessed through a project's sidebar nav.
 
 ![Screenshot of security configuration page](../img/security_configuration_page_v12_9.png)
 
-The page uses the project's latest default branch [CI pipeline](../../../ci/pipelines.md) to determine the configuration
+The page uses the project's latest default branch [CI pipeline](../../../ci/pipelines/index.md) to determine the configuration
 state of each feature. If a job with the expected security report artifact exists in the pipeline,
 the feature is considered configured.
 
diff --git a/doc/user/permissions.md b/doc/user/permissions.md
index 7f06eebc806..4f7284fb05b 100644
--- a/doc/user/permissions.md
+++ b/doc/user/permissions.md
@@ -420,7 +420,7 @@ read through the documentation on the [new CI/CD permissions model](project/new_
 The permission to merge or push to protected branches is used to define if a user can
 run CI/CD pipelines and execute actions on jobs that are related to those branches.
 
-See [Security on protected branches](../ci/pipelines.md#security-on-protected-branches)
+See [Security on protected branches](../ci/pipelines/index.md#security-on-protected-branches)
 for details about the pipelines security model.
 
 ## LDAP users permissions
diff --git a/doc/user/project/badges.md b/doc/user/project/badges.md
index c9228cd79a6..aaf70e4e4d6 100644
--- a/doc/user/project/badges.md
+++ b/doc/user/project/badges.md
@@ -75,5 +75,5 @@ You can also configure badges via the GitLab API. As in the settings, there is
 a distinction between endpoints for badges on the
 [project level](../../api/project_badges.md) and [group level](../../api/group_badges.md).
 
-[pipeline status]: pipelines/settings.md#pipeline-status-badge
-[test coverage]: pipelines/settings.md#test-coverage-report-badge
+[pipeline status]: ../../ci/pipelines/settings.md#pipeline-status-badge
+[test coverage]: ../../ci/pipelines/settings.md#test-coverage-report-badge
diff --git a/doc/user/project/clusters/index.md b/doc/user/project/clusters/index.md
index c9d7d723eb5..4594d415fa0 100644
--- a/doc/user/project/clusters/index.md
+++ b/doc/user/project/clusters/index.md
@@ -20,7 +20,7 @@ NOTE: **Scalable app deployment with GitLab and Google Cloud Platform**
 Using the GitLab project Kubernetes integration, you can:
 
 - Use [Review Apps](../../../ci/review_apps/index.md).
-- Run [pipelines](../../../ci/pipelines.md).
+- Run [pipelines](../../../ci/pipelines/index.md).
 - [Deploy](#deploying-to-a-kubernetes-cluster) your applications.
 - Detect and [monitor Kubernetes](#kubernetes-monitoring).
 - Use it with [Auto DevOps](#auto-devops).
diff --git a/doc/user/project/import/gemnasium.md b/doc/user/project/import/gemnasium.md
index b8ba5e89949..cf9ac15f5ac 100644
--- a/doc/user/project/import/gemnasium.md
+++ b/doc/user/project/import/gemnasium.md
@@ -102,5 +102,5 @@ back to both GitLab and GitHub when completed.
 
 NOTE: **Note:**
 If you don't commit very often to your project, you may want to use
-[scheduled pipelines](../pipelines/schedules.md) to run the job on a regular
+[scheduled pipelines](../../../ci/pipelines/schedules.md) to run the job on a regular
 basis.
diff --git a/doc/user/project/index.md b/doc/user/project/index.md
index ea36092168d..3a356ec0418 100644
--- a/doc/user/project/index.md
+++ b/doc/user/project/index.md
@@ -66,15 +66,15 @@ When you create a project in GitLab, you'll have access to a large number of
   - [Auto Deploy](../../topics/autodevops/index.md#auto-deploy): Configure GitLab CI/CD
   to automatically set up your app's deployment
   - [Enable and disable GitLab CI](../../ci/enable_or_disable_ci.md)
-  - [Pipelines](../../ci/pipelines.md): Configure and visualize
+  - [Pipelines](../../ci/pipelines/index.md): Configure and visualize
     your GitLab CI/CD pipelines from the UI
-    - [Scheduled Pipelines](pipelines/schedules.md): Schedule a pipeline
+    - [Scheduled Pipelines](../../ci/pipelines/schedules.md): Schedule a pipeline
       to start at a chosen time
-    - [Pipeline Graphs](../../ci/pipelines.md#visualizing-pipelines): View your
+    - [Pipeline Graphs](../../ci/pipelines/index.md#visualizing-pipelines): View your
       entire pipeline from the UI
-    - [Job artifacts](pipelines/job_artifacts.md): Define,
+    - [Job artifacts](../../ci/pipelines/job_artifacts.md): Define,
       browse, and download job artifacts
-    - [Pipeline settings](pipelines/settings.md): Set up Git strategy (choose the default way your repository is fetched from GitLab in a job),
+    - [Pipeline settings](../../ci/pipelines/settings.md): Set up Git strategy (choose the default way your repository is fetched from GitLab in a job),
       timeout (defines the maximum amount of time in minutes that a job is able run), custom path for `.gitlab-ci.yml`, test coverage parsing, pipeline's visibility, and much more
   - [Kubernetes cluster integration](clusters/index.md): Connecting your GitLab project
     with a Kubernetes cluster
diff --git a/doc/user/project/merge_requests/code_quality.md b/doc/user/project/merge_requests/code_quality.md
index ddc9e427ac2..5a8ce6a4f84 100644
--- a/doc/user/project/merge_requests/code_quality.md
+++ b/doc/user/project/merge_requests/code_quality.md
@@ -14,7 +14,7 @@ Code Quality:
 - Uses [Code Climate Engines](https://codeclimate.com), which are
   free and open source. Code Quality doesn't require a Code Climate
   subscription.
-- Runs in [pipelines](../../../ci/pipelines.md) using a Docker image built in the
+- Runs in [pipelines](../../../ci/pipelines/index.md) using a Docker image built in the
   [GitLab Code
   Quality](https://gitlab.com/gitlab-org/security-products/codequality) project using [default Code Climate configurations](https://gitlab.com/gitlab-org/security-products/codequality/-/tree/master/codeclimate_defaults).
 - Can make use of a [template](#example-configuration).
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index e0bf32baea6..8281de33e5f 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -94,14 +94,14 @@ or link to useful information directly in the merge request page:
 | [Accessibility Testing](accessibility_testing.md)                                                      | Automatically report A11y violations for changed pages in merge requests                                                                                                                                  |
 | [Browser Performance Testing](browser_performance_testing.md) **(PREMIUM)**                            | Quickly determine the performance impact of pending code changes.                                                                                                                                         |
 | [Code Quality](code_quality.md) **(STARTER)**                                                          | Analyze your source code quality using the [Code Climate](https://codeclimate.com/) analyzer and show the Code Climate report right in the merge request widget area.                                     |
-| [Display arbitrary job artifacts](../../../ci/yaml/README.md#artifactsexpose_as)                       | Configure CI pipelines with the `artifacts:expose_as` parameter to directly link to selected [artifacts](../pipelines/job_artifacts.md) in merge requests.                                                |
+| [Display arbitrary job artifacts](../../../ci/yaml/README.md#artifactsexpose_as)                       | Configure CI pipelines with the `artifacts:expose_as` parameter to directly link to selected [artifacts](../../../ci/pipelines/job_artifacts.md) in merge requests.                                                |
 | [GitLab CI/CD](../../../ci/README.md)                                                                  | Build, test, and deploy your code in a per-branch basis with built-in CI/CD.                                                                                                                              |
 | [JUnit test reports](../../../ci/junit_test_reports.md)                                                | Configure your CI jobs to use JUnit test reports, and let GitLab display a report on the merge request so that it’s easier and faster to identify the failure without having to check the entire job log. |
 | [License Compliance](../../compliance/license_compliance/index.md) **(ULTIMATE)**                      | Manage the licenses of your dependencies. |
 | [Metrics Reports](../../../ci/metrics_reports.md) **(PREMIUM)**                                        | Display the Metrics Report on the merge request so that it's fast and easy to identify changes to important metrics.                                                                                      |
 | [Multi-Project pipelines](../../../ci/multi_project_pipelines.md) **(PREMIUM)**                        | When you set up GitLab CI/CD across multiple projects, you can visualize the entire pipeline, including all cross-project interdependencies.                                                              |
 | [Pipelines for merge requests](../../../ci/merge_request_pipelines/index.md)                           | Customize a specific pipeline structure for merge requests in order to speed the cycle up by running only important jobs.                                                                                 |
-| [Pipeline Graphs](../../../ci/pipelines.md#visualizing-pipelines)                                      | View the status of pipelines within the merge request, including the deployment process.                                                                                                                  |
+| [Pipeline Graphs](../../../ci/pipelines/index.md#visualizing-pipelines)                                      | View the status of pipelines within the merge request, including the deployment process.                                                                                                                  |
 
 ### Security Reports **(ULTIMATE)**
 
diff --git a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
index f3f791a3e22..bb9192e3600 100644
--- a/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
+++ b/doc/user/project/merge_requests/reviewing_and_managing_merge_requests.md
@@ -120,7 +120,7 @@ be disabled. If the pipeline fails to deploy, the deployment info will be hidden
 
 ![Merge request pipeline](img/merge_request_pipeline.png)
 
-For more information, [read about pipelines](../../../ci/pipelines.md).
+For more information, [read about pipelines](../../../ci/pipelines/index.md).
 
 ### Merge when pipeline succeeds (MWPS)
 
diff --git a/doc/user/project/pipelines/img/pipelines_settings_badges.png b/doc/user/project/pipelines/img/pipelines_settings_badges.png
deleted file mode 100644
index 3bdc6374c15..00000000000
Binary files a/doc/user/project/pipelines/img/pipelines_settings_badges.png and /dev/null differ
diff --git a/doc/user/project/pipelines/img/pipelines_settings_test_coverage.png b/doc/user/project/pipelines/img/pipelines_settings_test_coverage.png
deleted file mode 100644
index 13ed69be810..00000000000
Binary files a/doc/user/project/pipelines/img/pipelines_settings_test_coverage.png and /dev/null differ
diff --git a/doc/user/project/pipelines/img/pipelines_test_coverage_build.png b/doc/user/project/pipelines/img/pipelines_test_coverage_build.png
deleted file mode 100644
index 7eaba1a256f..00000000000
Binary files a/doc/user/project/pipelines/img/pipelines_test_coverage_build.png and /dev/null differ
diff --git a/doc/user/project/pipelines/img/pipelines_test_coverage_mr_widget.png b/doc/user/project/pipelines/img/pipelines_test_coverage_mr_widget.png
deleted file mode 100644
index fbcd612f3f2..00000000000
Binary files a/doc/user/project/pipelines/img/pipelines_test_coverage_mr_widget.png and /dev/null differ
diff --git a/doc/user/project/pipelines/job_artifacts.md b/doc/user/project/pipelines/job_artifacts.md
index 5892a1be494..c23eaebcbe9 100644
--- a/doc/user/project/pipelines/job_artifacts.md
+++ b/doc/user/project/pipelines/job_artifacts.md
@@ -2,4 +2,4 @@
 redirect_to: '../../../ci/pipelines/job_artifacts.md'
 ---
 
-This document was moved to [pipelines/job_artifacts.md](../../../ci/pipelines/job_artifacts.md).
+This document was moved to [another location](../../../ci/pipelines/job_artifacts.md).
diff --git a/doc/user/project/pipelines/settings.md b/doc/user/project/pipelines/settings.md
index f67f0896de4..af4cbe13aba 100644
--- a/doc/user/project/pipelines/settings.md
+++ b/doc/user/project/pipelines/settings.md
@@ -1,308 +1,5 @@
 ---
-type: reference, howto
+redirect_to: '../../../ci/pipelines/settings.md'
 ---
 
-# Pipelines settings
-
-To reach the pipelines settings navigate to your project's
-**Settings > CI/CD**.
-
-The following settings can be configured per project.
-
-<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
-For an overview, watch the video [GitLab CI Pipeline, Artifacts, and Environments](https://www.youtube.com/watch?v=PCKDICEe10s).
-Watch also [GitLab CI pipeline tutorial for beginners](https://www.youtube.com/watch?v=Jav4vbUrqII).
-
-## Git strategy
-
-With Git strategy, you can choose the default way your repository is fetched
-from GitLab in a job.
-
-There are two options. Using:
-
-- `git clone`, which is slower since it clones the repository from scratch
-  for every job, ensuring that the local working copy is always pristine.
-- `git fetch`, which is faster as it re-uses the local working copy (falling
-  back to clone if it doesn't exist).
-
-The default Git strategy can be overridden by the [GIT_STRATEGY variable](../../../ci/yaml/README.md#git-strategy)
-in `.gitlab-ci.yml`.
-
-## Git shallow clone
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/28919) in GitLab 12.0.
-
-NOTE: **Note**:
-As of GitLab 12.0, newly created projects will automatically have a default
-`git depth` value of `50`.
-
-It is possible to limit the number of changes that GitLab CI/CD will fetch when cloning
-a repository. Setting a limit to `git depth` can speed up Pipelines execution. Maximum
-allowed value is `1000`.
-
-To disable shallow clone and make GitLab CI/CD fetch all branches and tags each time,
-keep the value empty or set to `0`.
-
-This value can also be [overridden by `GIT_DEPTH`](../../../ci/large_repositories/index.md#shallow-cloning) variable in `.gitlab-ci.yml` file.
-
-## Timeout
-
-Timeout defines the maximum amount of time in minutes that a job is able run.
-This is configurable under your project's **Settings > CI/CD > General pipelines settings**.
-The default value is 60 minutes. Decrease the time limit if you want to impose
-a hard limit on your jobs' running time or increase it otherwise. In any case,
-if the job surpasses the threshold, it is marked as failed.
-
-### Timeout overriding on Runner level
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/17221) in GitLab 10.7.
-
-Project defined timeout (either specific timeout set by user or the default
-60 minutes timeout) may be [overridden on Runner level](../../../ci/runners/README.md#setting-maximum-job-timeout-for-a-runner).
-
-## Maximum artifacts size **(CORE ONLY)**
-
-For information about setting a maximum artifact size for a project, see
-[Maximum artifacts size](../../admin_area/settings/continuous_integration.md#maximum-artifacts-size-core-only).
-
-## Custom CI configuration path
-
-> - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/12509) in GitLab 9.4.
-> - [Support for external `.gitlab-ci.yml` locations](https://gitlab.com/gitlab-org/gitlab/issues/14376) introduced in GitLab 12.6.
-
-By default we look for the `.gitlab-ci.yml` file in the project's root
-directory. If needed, you can specify an alternate path and file name, including locations outside the project.
-
-To customize the path:
-
-1. Go to the project's **Settings > CI / CD**.
-1. Expand the **General pipelines** section.
-1. Provide a value in the **Custom CI configuration path** field.
-1. Click **Save changes**.
-
-If the CI configuration is stored within the repository in a non-default
-location, the path must be relative to the root directory. Examples of valid
-paths and file names include:
-
-- `.gitlab-ci.yml` (default)
-- `.my-custom-file.yml`
-- `my/path/.gitlab-ci.yml`
-- `my/path/.my-custom-file.yml`
-
-If the CI configuration will be hosted on an external site, the URL link must end with `.yml`:
-
-- `http://example.com/generate/ci/config.yml`
-
-If the CI configuration will be hosted in a different project within GitLab, the path must be relative
-to the root directory in the other project, with the group and project name added to the end:
-
-- `.gitlab-ci.yml@mygroup/another-project`
-- `my/path/.my-custom-file.yml@mygroup/another-project`
-
-Hosting the configuration file in a separate project allows stricter control of the
-configuration file. For example:
-
-- Create a public project to host the configuration file.
-- Give write permissions on the project only to users who are allowed to edit the file.
-
-Other users and projects will be able to access the configuration file without being
-able to edit it.
-
-## Test coverage parsing
-
-If you use test coverage in your code, GitLab can capture its output in the
-job log using a regular expression. In the pipelines settings, search for the
-"Test coverage parsing" section.
-
-![Pipelines settings test coverage](img/pipelines_settings_test_coverage.png)
-
-Leave blank if you want to disable it or enter a ruby regular expression. You
-can use <https://rubular.com> to test your regex.
-
-If the pipeline succeeds, the coverage is shown in the merge request widget and
-in the jobs table.
-
-![MR widget coverage](img/pipelines_test_coverage_mr_widget.png)
-
-![Build status coverage](img/pipelines_test_coverage_build.png)
-
-A few examples of known coverage tools for a variety of languages can be found
-in the pipelines settings page.
-
-### Removing color codes
-
-Some test coverage tools output with ANSI color codes that won't be
-parsed correctly by the regular expression and will cause coverage
-parsing to fail.
-
-If your coverage tool doesn't provide an option to disable color
-codes in the output, you can pipe the output of the coverage tool through a
-small one line script that will strip the color codes off.
-
-For example:
-
-```shell
-lein cloverage | perl -pe 's/\e\[?.*?[\@-~]//g'
-```
-
-## Visibility of pipelines
-
-Pipeline visibility is determined by:
-
-- Your current [user access level](../../permissions.md).
-- The **Public pipelines** project setting under your project's **Settings > CI/CD > General pipelines**.
-
-NOTE: **Note:**
-If the project visibility is set to **Private**, the [**Public pipelines** setting will have no effect](../../../ci/enable_or_disable_ci.md#per-project-user-setting).
-
-This also determines the visibility of these related features:
-
-- Job output logs
-- Job artifacts
-- The [pipeline security dashboard](../../application_security/security_dashboard/index.md#pipeline-security-dashboard) **(ULTIMATE)**
-
-If **Public pipelines** is enabled (default):
-
-- For **public** projects, anyone can view the pipelines and related features.
-- For **internal** projects, any logged in user can view the pipelines
-  and related features.
-- For **private** projects, any project member (guest or higher) can view the pipelines
-  and related features.
-
-If **Public pipelines** is disabled:
-
-- For **public** projects, anyone can view the pipelines, but only members
-  (reporter or higher) can access the related features.
-- For **internal** projects, any logged in user can view the pipelines.
-  However, only members (reporter or higher) can access the job related features.
-- For **private** projects, only project members (reporter or higher)
-  can view the pipelines or access the related features.
-
-## Auto-cancel pending pipelines
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/9362) in GitLab 9.1.
-
-If you want all pending non-HEAD pipelines on branches to auto-cancel each time
-a new pipeline is created, such as after a Git push or manually from the UI,
-you can enable this in the project settings:
-
-1. Go to **{settings}** **Settings > CI / CD**.
-1. Expand **General Pipelines**.
-1. Check the **Auto-cancel redundant, pending pipelines** checkbox.
-1. Click **Save changes**.
-
-## Skip older, pending deployment jobs
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab/issues/25276) in GitLab 12.9.
-
-Your project may have multiple concurrent deployment jobs that are
-scheduled to run within the same time frame.
-
-This can lead to a situation where an older deployment job runs after a
-newer one, which may not be what you want.
-
-To avoid this scenario:
-
-1. Go to **{settings}** **Settings > CI / CD**.
-1. Expand **General pipelines**.
-1. Check the **Skip older, pending deployment jobs** checkbox.
-1. Click **Save changes**.
-
-The pending deployment jobs will be skipped.
-
-## Pipeline Badges
-
-In the pipelines settings page you can find pipeline status and test coverage
-badges for your project. The latest successful pipeline will be used to read
-the pipeline status and test coverage values.
-
-Visit the pipelines settings page in your project to see the exact link to
-your badges, as well as ways to embed the badge image in your HTML or Markdown
-pages.
-
-![Pipelines badges](img/pipelines_settings_badges.png)
-
-### Pipeline status badge
-
-Depending on the status of your job, a badge can have the following values:
-
-- pending
-- running
-- passed
-- failed
-- skipped
-- canceled
-- unknown
-
-You can access a pipeline status badge image using the following link:
-
-```text
-https://example.gitlab.com/<namespace>/<project>/badges/<branch>/pipeline.svg
-```
-
-### Test coverage report badge
-
-GitLab makes it possible to define the regular expression for [coverage report](#test-coverage-parsing),
-that each job log will be matched against. This means that each job in the
-pipeline can have the test coverage percentage value defined.
-
-The test coverage badge can be accessed using following link:
-
-```text
-https://example.gitlab.com/<namespace>/<project>/badges/<branch>/coverage.svg
-```
-
-If you would like to get the coverage report from a specific job, you can add
-the `job=coverage_job_name` parameter to the URL. For example, the following
-Markdown code will embed the test coverage report badge of the `coverage` job
-into your `README.md`:
-
-```markdown
-![coverage](https://gitlab.com/gitlab-org/gitlab-foss/badges/master/coverage.svg?job=coverage)
-```
-
-### Badge styles
-
-Pipeline badges can be rendered in different styles by adding the `style=style_name` parameter to the URL. Currently two styles are available:
-
-#### Flat (default)
-
-```text
-https://example.gitlab.com/<namespace>/<project>/badges/<branch>/coverage.svg?style=flat
-```
-
-![Badge flat style](https://gitlab.com/gitlab-org/gitlab-foss/badges/master/coverage.svg?job=coverage&style=flat)
-
-#### Flat square
-
-> [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/issues/30120) in GitLab 11.8.
-
-```text
-https://example.gitlab.com/<namespace>/<project>/badges/<branch>/coverage.svg?style=flat-square
-```
-
-![Badge flat square style](https://gitlab.com/gitlab-org/gitlab-foss/badges/master/coverage.svg?job=coverage&style=flat-square)
-
-## Environment Variables
-
-[Environment variables](../../../ci/variables/README.md#gitlab-cicd-environment-variables) can be set in an environment to be available to a runner.
-
-## Deploy Keys
-
-With Deploy Keys, GitLab allows you to import SSH public keys. You can then have
-read only or read/write access to your project from the machines the keys were generated from.
-
-SSH keys added to your project settings will be used for continuous integration,
-staging, or production servers.
-
-<!-- ## Troubleshooting
-
-Include any troubleshooting steps that you can foresee. If you know beforehand what issues
-one might have when setting this up, or when something is changed, or on upgrading, it's
-important to describe those, too. Think of things that may go wrong and include them here.
-This is important to minimize requests for support, and to avoid doc comments with
-questions that you know someone might ask.
-
-Each scenario can be a third-level heading, e.g. `### Getting error message X`.
-If you have none to add when creating a doc, leave this section in place
-but commented out to help encourage others to add to it in the future. -->
+This document was moved to [another location](../../../ci/pipelines/settings.md).
diff --git a/doc/user/project/protected_branches.md b/doc/user/project/protected_branches.md
index ab6b4e7f858..14feb189964 100644
--- a/doc/user/project/protected_branches.md
+++ b/doc/user/project/protected_branches.md
@@ -187,7 +187,7 @@ Additionally, direct pushes to the protected branch are denied if a rule is matc
 The permission to merge or push to protected branches is used to define if a user can
 run CI/CD pipelines and execute actions on jobs that are related to those branches.
 
-See [Security on protected branches](../../ci/pipelines.md#security-on-protected-branches)
+See [Security on protected branches](../../ci/pipelines/index.md#security-on-protected-branches)
 for details about the pipelines security model.
 
 ## Changelog
diff --git a/lib/gitlab/background_migration/user_mentions/models/epic.rb b/lib/gitlab/background_migration/user_mentions/models/epic.rb
index a76391d64bb..dc2b7819800 100644
--- a/lib/gitlab/background_migration/user_mentions/models/epic.rb
+++ b/lib/gitlab/background_migration/user_mentions/models/epic.rb
@@ -18,6 +18,7 @@ module Gitlab
           self.table_name = 'epics'
 
           belongs_to :author, class_name: "User"
+          belongs_to :project
           belongs_to :group
 
           def self.user_mention_model
diff --git a/lib/gitlab/import_export/fast_hash_serializer.rb b/lib/gitlab/import_export/fast_hash_serializer.rb
index 5a067b5c9f3..c6ecf13ded8 100644
--- a/lib/gitlab/import_export/fast_hash_serializer.rb
+++ b/lib/gitlab/import_export/fast_hash_serializer.rb
@@ -136,6 +136,12 @@ module Gitlab
         data = []
 
         record.in_batches(of: @batch_size) do |batch| # rubocop:disable Cop/InBatches
+          # order each batch by it's primary key to ensure
+          # consistent and predictable ordering of each exported relation
+          # as additional `WHERE` clauses can impact the order in which data is being
+          # returned by database when no `ORDER` is specified
+          batch = batch.reorder(batch.klass.primary_key)
+
           if Feature.enabled?(:export_fast_serialize_with_raw_json, default_enabled: true)
             data.append(JSONBatchRelation.new(batch, options, preloads[key]).tap(&:raw_json))
           else
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3017de1c198..601703b8f22 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -106,13 +106,18 @@ msgid_plural "%d contributions"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%d error"
+msgid_plural "%d errors"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d exporter"
 msgid_plural "%d exporters"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d failed/error test result"
-msgid_plural "%d failed/error test results"
+msgid "%d failed"
+msgid_plural "%d failed"
 msgstr[0] ""
 msgstr[1] ""
 
@@ -1679,9 +1684,6 @@ msgstr ""
 msgid "Allow users to request access (if visibility is public or internal)"
 msgstr ""
 
-msgid "Allow variables to run on protected branches and tags."
-msgstr ""
-
 msgid "Allowed email domain restriction only permitted for top-level groups"
 msgstr ""
 
@@ -3710,6 +3712,9 @@ msgstr ""
 msgid "Choose which shards you wish to synchronize to this secondary node."
 msgstr ""
 
+msgid "Choose which status most accurately reflects the current state of this issue:"
+msgstr ""
+
 msgid "CiStatusLabel|canceled"
 msgstr ""
 
@@ -3788,7 +3793,7 @@ msgstr ""
 msgid "CiVariables|Cannot use Masked Variable with current value"
 msgstr ""
 
-msgid "CiVariables|Environment Scope"
+msgid "CiVariables|Environments"
 msgstr ""
 
 msgid "CiVariables|Input variable key"
@@ -5556,6 +5561,9 @@ msgstr ""
 msgid "Copy commit SHA"
 msgstr ""
 
+msgid "Copy environment"
+msgstr ""
+
 msgid "Copy evidence SHA"
 msgstr ""
 
@@ -5568,6 +5576,9 @@ msgstr ""
 msgid "Copy impersonation token"
 msgstr ""
 
+msgid "Copy key"
+msgstr ""
+
 msgid "Copy labels and milestone from %{source_issuable_reference}."
 msgstr ""
 
@@ -5592,6 +5603,9 @@ msgstr ""
 msgid "Copy trigger token"
 msgstr ""
 
+msgid "Copy value"
+msgstr ""
+
 msgid "Could not add admins as members"
 msgstr ""
 
@@ -6362,6 +6376,9 @@ msgstr ""
 msgid "Delete this attachment"
 msgstr ""
 
+msgid "Delete variable"
+msgstr ""
+
 msgid "DeleteProject|Failed to remove project repository. Please try again or contact administrator."
 msgstr ""
 
@@ -7958,6 +7975,9 @@ msgstr ""
 msgid "Error occurred when toggling the notification subscription"
 msgstr ""
 
+msgid "Error occurred while updating the issue status"
+msgstr ""
+
 msgid "Error occurred while updating the issue weight"
 msgstr ""
 
@@ -8252,6 +8272,9 @@ msgstr ""
 msgid "Export this project with all its related data in order to move your project to a new GitLab instance. Once the export is finished, you can import the file from the \"New Project\" page."
 msgstr ""
 
+msgid "Export variable to pipelines running on protected branches and tags only."
+msgstr ""
+
 msgid "External Classification Policy Authorization"
 msgstr ""
 
@@ -8822,6 +8845,9 @@ msgstr ""
 msgid "Fixed:"
 msgstr ""
 
+msgid "Flags"
+msgstr ""
+
 msgid "FlowdockService|Flowdock Git source token"
 msgstr ""
 
@@ -16578,7 +16604,7 @@ msgstr ""
 msgid "Reporting"
 msgstr ""
 
-msgid "Reports|%{failedString} and %{resolvedString}"
+msgid "Reports|%{combinedString} and %{resolvedString}"
 msgstr ""
 
 msgid "Reports|Actions"
@@ -16717,6 +16743,9 @@ msgid_plural "Requires %d more approvals."
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Requires values to meet regular expression requirements."
+msgstr ""
+
 msgid "Resend confirmation email"
 msgstr ""
 
@@ -19849,9 +19878,6 @@ msgstr ""
 msgid "The value lying at the midpoint of a series of observed values. E.g., between 3, 5, 9, the median is 5. Between 3, 5, 7, 8, the median is (5+7)/2 = 6."
 msgstr ""
 
-msgid "There are currently no variables, add a variable with the Add Variable button below."
-msgstr ""
-
 msgid "There are no GPG keys associated with this account."
 msgstr ""
 
@@ -19906,6 +19932,9 @@ msgstr ""
 msgid "There are no projects shared with this group yet"
 msgstr ""
 
+msgid "There are no variables yet."
+msgstr ""
+
 msgid "There is a limit of %{ci_project_subscriptions_limit} subscriptions from or to a project."
 msgstr ""
 
@@ -20425,6 +20454,9 @@ msgstr ""
 msgid "This user will be the author of all events in the activity feed that are the result of an update, like new branches being created or new commits being pushed to existing branches. Upon creation or when reassigning you can only assign yourself to be the mirror user."
 msgstr ""
 
+msgid "This variable can not be masked"
+msgstr ""
+
 msgid "This will help us personalize your onboarding experience."
 msgstr ""
 
@@ -21362,9 +21394,6 @@ msgstr ""
 msgid "Update"
 msgstr ""
 
-msgid "Update Variable"
-msgstr ""
-
 msgid "Update all"
 msgstr ""
 
@@ -21383,6 +21412,9 @@ msgstr ""
 msgid "Update now"
 msgstr ""
 
+msgid "Update variable"
+msgstr ""
+
 msgid "Update your bookmarked URLs as filtered/sorted branches URL has been changed."
 msgstr ""
 
@@ -21992,13 +22024,13 @@ msgstr ""
 msgid "Value Stream Analytics gives an overview of how much time it takes to go from idea to production in your project."
 msgstr ""
 
-msgid "Variable"
+msgid "Var"
 msgstr ""
 
-msgid "Variables"
+msgid "Variable will be masked in job logs."
 msgstr ""
 
-msgid "Variables will be masked in job logs. Requires values to meet regular expression requirements."
+msgid "Variables"
 msgstr ""
 
 msgid "Various container registry settings."
diff --git a/rubocop/cop/migration/with_lock_retries_with_change.rb b/rubocop/cop/migration/with_lock_retries_with_change.rb
new file mode 100644
index 00000000000..36fc1f92833
--- /dev/null
+++ b/rubocop/cop/migration/with_lock_retries_with_change.rb
@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+require_relative '../../migration_helpers'
+
+module RuboCop
+  module Cop
+    module Migration
+      # Cop that prevents usage of `with_lock_retries` within the `change` method.
+      class WithLockRetriesWithChange < RuboCop::Cop::Cop
+        include MigrationHelpers
+
+        MSG = '`with_lock_retries` cannot be used within `change` so you must manually define ' \
+          'the `up` and `down` methods in your migration class and use `with_lock_retries` in both methods'.freeze
+
+        def on_send(node)
+          return unless in_migration?(node)
+          return unless node.children[1] == :with_lock_retries
+
+          node.each_ancestor(:def) do |def_node|
+            add_offense(def_node, location: :name) if method_name(def_node) == :change
+          end
+        end
+
+        def method_name(node)
+          node.children.first
+        end
+      end
+    end
+  end
+end
diff --git a/spec/db/schema_spec.rb b/spec/db/schema_spec.rb
index f2f7d6cbafc..c6c842ce1a1 100644
--- a/spec/db/schema_spec.rb
+++ b/spec/db/schema_spec.rb
@@ -60,6 +60,7 @@ describe 'Database schema' do
     oauth_access_grants: %w[resource_owner_id application_id],
     oauth_access_tokens: %w[resource_owner_id application_id],
     oauth_applications: %w[owner_id],
+    open_project_tracker_data: %w[closed_status_id],
     project_group_links: %w[group_id],
     project_statistics: %w[namespace_id],
     projects: %w[creator_id namespace_id ci_id mirror_user_id],
diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb
index 94f57cdda74..eca011bc786 100644
--- a/spec/features/merge_request/user_sees_merge_widget_spec.rb
+++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb
@@ -585,10 +585,10 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 1 failed/error test result out of 2 total tests')
+            expect(page).to have_content('Test summary contained 1 failed out of 2 total tests')
             within(".js-report-section-container") do
               expect(page).to have_content('rspec found no changed test results out of 1 total test')
-              expect(page).to have_content('junit found 1 failed/error test result out of 1 total test')
+              expect(page).to have_content('junit found 1 failed out of 1 total test')
               expect(page).to have_content('New')
               expect(page).to have_content('addTest')
             end
@@ -630,9 +630,9 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 1 failed/error test result out of 2 total tests')
+            expect(page).to have_content('Test summary contained 1 failed out of 2 total tests')
             within(".js-report-section-container") do
-              expect(page).to have_content('rspec found 1 failed/error test result out of 1 total test')
+              expect(page).to have_content('rspec found 1 failed out of 1 total test')
               expect(page).to have_content('junit found no changed test results out of 1 total test')
               expect(page).not_to have_content('New')
               expect(page).to have_content('Test#sum when a is 1 and b is 3 returns summary')
@@ -718,10 +718,10 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 1 failed/error test result out of 2 total tests')
+            expect(page).to have_content('Test summary contained 1 error out of 2 total tests')
             within(".js-report-section-container") do
               expect(page).to have_content('rspec found no changed test results out of 1 total test')
-              expect(page).to have_content('junit found 1 failed/error test result out of 1 total test')
+              expect(page).to have_content('junit found 1 error out of 1 total test')
               expect(page).to have_content('New')
               expect(page).to have_content('addTest')
             end
@@ -762,9 +762,9 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 1 failed/error test result out of 2 total tests')
+            expect(page).to have_content('Test summary contained 1 error out of 2 total tests')
             within(".js-report-section-container") do
-              expect(page).to have_content('rspec found 1 failed/error test result out of 1 total test')
+              expect(page).to have_content('rspec found 1 error out of 1 total test')
               expect(page).to have_content('junit found no changed test results out of 1 total test')
               expect(page).not_to have_content('New')
               expect(page).to have_content('Test#sum when a is 4 and b is 4 returns summary')
@@ -857,10 +857,10 @@ describe 'Merge request > User sees merge widget', :js do
           within(".js-reports-container") do
             click_button 'Expand'
 
-            expect(page).to have_content('Test summary contained 20 failed/error test results out of 20 total tests')
+            expect(page).to have_content('Test summary contained 20 failed out of 20 total tests')
             within(".js-report-section-container") do
-              expect(page).to have_content('rspec found 10 failed/error test results out of 10 total tests')
-              expect(page).to have_content('junit found 10 failed/error test results out of 10 total tests')
+              expect(page).to have_content('rspec found 10 failed out of 10 total tests')
+              expect(page).to have_content('junit found 10 failed out of 10 total tests')
 
               expect(page).to have_content('Test#sum when a is 1 and b is 3 returns summary', count: 2)
             end
diff --git a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
index be2c017cc7e..8db6626fca3 100644
--- a/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
+++ b/spec/frontend/ci_variable_list/components/ci_variable_modal_spec.js
@@ -35,10 +35,6 @@ describe('Ci variable modal', () => {
     expect(findModal().props('actionPrimary').attributes.disabled).toBeTruthy();
   });
 
-  it('masked checkbox is disabled when value does not meet regex requirements', () => {
-    expect(wrapper.find({ ref: 'masked-ci-variable' }).attributes('disabled')).toBeTruthy();
-  });
-
   describe('Adding a new variable', () => {
     beforeEach(() => {
       const [variable] = mockData.mockVariables;
@@ -49,13 +45,6 @@ describe('Ci variable modal', () => {
       expect(findModal().props('actionPrimary').attributes.disabled).toBeFalsy();
     });
 
-    it('masked checkbox is enabled when value meets regex requirements', () => {
-      store.state.maskableRegex = '^[a-zA-Z0-9_+=/@:-]{8,}$';
-      return wrapper.vm.$nextTick(() => {
-        expect(wrapper.find({ ref: 'masked-ci-variable' }).attributes('disabled')).toBeFalsy();
-      });
-    });
-
     it('Add variable button dispatches addVariable action', () => {
       findModal().vm.$emit('ok');
       expect(store.dispatch).toHaveBeenCalledWith('addVariable');
@@ -74,7 +63,7 @@ describe('Ci variable modal', () => {
     });
 
     it('button text is Update variable when updating', () => {
-      expect(wrapper.vm.modalActionText).toBe('Update Variable');
+      expect(wrapper.vm.modalActionText).toBe('Update variable');
     });
 
     it('Update variable button dispatches updateVariable with correct variable', () => {
@@ -89,5 +78,10 @@ describe('Ci variable modal', () => {
       findModal().vm.$emit('hidden');
       expect(store.dispatch).toHaveBeenCalledWith('resetEditing');
     });
+
+    it('dispatches deleteVariable with correct variable to delete', () => {
+      findModal().vm.$emit('secondary');
+      expect(store.dispatch).toHaveBeenCalledWith('deleteVariable', mockData.mockVariables[0]);
+    });
   });
 });
diff --git a/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
new file mode 100644
index 00000000000..5d37f059161
--- /dev/null
+++ b/spec/frontend/ci_variable_list/components/ci_variable_popover_spec.js
@@ -0,0 +1,48 @@
+import { shallowMount } from '@vue/test-utils';
+import { GlButton } from '@gitlab/ui';
+import CiVariablePopover from '~/ci_variable_list/components/ci_variable_popover.vue';
+import mockData from '../services/mock_data';
+
+describe('Ci Variable Popover', () => {
+  let wrapper;
+
+  const defaultProps = {
+    target: 'ci-variable-value-22',
+    value: mockData.mockPemCert,
+    tooltipText: 'Copy value',
+  };
+
+  const createComponent = (props = defaultProps) => {
+    wrapper = shallowMount(CiVariablePopover, {
+      propsData: { ...props },
+    });
+  };
+
+  const findButton = () => wrapper.find(GlButton);
+
+  beforeEach(() => {
+    createComponent();
+  });
+
+  afterEach(() => {
+    wrapper.destroy();
+    wrapper = null;
+  });
+
+  it('displays max count plus ... when character count is over 95', () => {
+    expect(wrapper.text()).toHaveLength(98);
+  });
+
+  it('copies full value to clipboard', () => {
+    expect(findButton().attributes('data-clipboard-text')).toEqual(mockData.mockPemCert);
+  });
+
+  it('displays full value when count is less than max count', () => {
+    createComponent({
+      target: 'ci-variable-value-22',
+      value: 'test_variable_value',
+      tooltipText: 'Copy value',
+    });
+    expect(wrapper.text()).toEqual('test_variable_value');
+  });
+});
diff --git a/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js b/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js
index 973a9c51f16..36aeffe7798 100644
--- a/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js
+++ b/spec/frontend/ci_variable_list/components/ci_variable_table_spec.js
@@ -17,12 +17,12 @@ describe('Ci variable table', () => {
     store.state.isGroup = true;
     jest.spyOn(store, 'dispatch').mockImplementation();
     wrapper = mount(CiVariableTable, {
+      attachToDocument: true,
       localVue,
       store,
     });
   };
 
-  const findDeleteButton = () => wrapper.find({ ref: 'delete-ci-variable' });
   const findRevealButton = () => wrapper.find({ ref: 'secret-value-reveal-button' });
   const findEditButton = () => wrapper.find({ ref: 'edit-ci-variable' });
   const findEmptyVariablesPlaceholder = () => wrapper.find({ ref: 'empty-variables' });
@@ -71,11 +71,6 @@ describe('Ci variable table', () => {
       store.state.variables = mockData.mockVariables;
     });
 
-    it('dispatches deleteVariable with correct variable to delete', () => {
-      findDeleteButton().trigger('click');
-      expect(store.dispatch).toHaveBeenCalledWith('deleteVariable', mockData.mockVariables[0]);
-    });
-
     it('reveals secret values when button is clicked', () => {
       findRevealButton().trigger('click');
       expect(store.dispatch).toHaveBeenCalledWith('toggleValues', false);
diff --git a/spec/frontend/ci_variable_list/services/mock_data.js b/spec/frontend/ci_variable_list/services/mock_data.js
index b04cd223d42..5e0fa55a20c 100644
--- a/spec/frontend/ci_variable_list/services/mock_data.js
+++ b/spec/frontend/ci_variable_list/services/mock_data.js
@@ -6,8 +6,9 @@ export default {
       key: 'test_var',
       masked: false,
       protected: false,
+      secret_value: 'test_val',
       value: 'test_val',
-      variable_type: 'Variable',
+      variable_type: 'Var',
     },
   ],
 
@@ -18,6 +19,7 @@ export default {
       key: 'test_var',
       masked: false,
       protected: false,
+      secret_value: 'test_val',
       value: 'test_val',
       variable_type: 'env_var',
     },
@@ -27,6 +29,7 @@ export default {
       key: 'test_var_2',
       masked: false,
       protected: false,
+      secret_value: 'test_val_2',
       value: 'test_val_2',
       variable_type: 'file',
     },
@@ -34,20 +37,22 @@ export default {
 
   mockVariablesDisplay: [
     {
-      environment_scope: 'All environments',
+      environment_scope: 'All',
       id: 113,
       key: 'test_var',
       masked: false,
       protected: false,
+      secret_value: 'test_val',
       value: 'test_val',
-      variable_type: 'Variable',
+      variable_type: 'Var',
     },
     {
-      environment_scope: 'All environments',
+      environment_scope: 'All',
       id: 114,
       key: 'test_var_2',
       masked: false,
       protected: false,
+      secret_value: 'test_val_2',
       value: 'test_val_2',
       variable_type: 'File',
     },
@@ -69,4 +74,18 @@ export default {
       state: 'available',
     },
   ],
+
+  mockPemCert: `-----BEGIN CERTIFICATE REQUEST-----
+  MIIB9TCCAWACAQAwgbgxGTAXBgNVBAoMEFF1b1ZhZGlzIExpbWl0ZWQxHDAaBgNV
+  BAsME0RvY3VtZW50IERlcGFydG1lbnQxOTA3BgNVBAMMMFdoeSBhcmUgeW91IGRl
+  Y29kaW5nIG1lPyAgVGhpcyBpcyBvbmx5IGEgdGVzdCEhITERMA8GA1UEBwwISGFt
+  aWx0b24xETAPBgNVBAgMCFBlbWJyb2tlMQswCQYDVQQGEwJCTTEPMA0GCSqGSIb3
+  DQEJARYAMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCJ9WRanG/fUvcfKiGl
+  EL4aRLjGt537mZ28UU9/3eiJeJznNSOuNLnF+hmabAu7H0LT4K7EdqfF+XUZW/2j
+  RKRYcvOUDGF9A7OjW7UfKk1In3+6QDCi7X34RE161jqoaJjrm/T18TOKcgkkhRzE
+  apQnIDm0Ea/HVzX/PiSOGuertwIDAQABMAsGCSqGSIb3DQEBBQOBgQBzMJdAV4QP
+  Awel8LzGx5uMOshezF/KfP67wJ93UW+N7zXY6AwPgoLj4Kjw+WtU684JL8Dtr9FX
+  ozakE+8p06BpxegR4BR3FMHf6p+0jQxUEAkAyb/mVgm66TyghDGC6/YkiKoZptXQ
+  98TwDIK/39WEB/V607As+KoYazQG8drorw==
+  -----END CERTIFICATE REQUEST-----`,
 };
diff --git a/spec/frontend/ci_variable_list/store/mutations_spec.js b/spec/frontend/ci_variable_list/store/mutations_spec.js
index 1bb34e88cf5..05513edff7b 100644
--- a/spec/frontend/ci_variable_list/store/mutations_spec.js
+++ b/spec/frontend/ci_variable_list/store/mutations_spec.js
@@ -48,12 +48,12 @@ describe('CI variable list mutations', () => {
   describe('CLEAR_MODAL', () => {
     it('should clear modal state ', () => {
       const modalState = {
-        variable_type: 'Variable',
+        variable_type: 'Var',
         key: '',
         secret_value: '',
         protected: false,
         masked: false,
-        environment_scope: 'All environments',
+        environment_scope: 'All',
       };
 
       mutations[types.CLEAR_MODAL](stateCopy);
diff --git a/spec/frontend/ci_variable_list/store/utils_spec.js b/spec/frontend/ci_variable_list/store/utils_spec.js
index 070bc996d75..5b10370324a 100644
--- a/spec/frontend/ci_variable_list/store/utils_spec.js
+++ b/spec/frontend/ci_variable_list/store/utils_spec.js
@@ -19,6 +19,7 @@ describe('CI variables store utils', () => {
       key: 'test_var',
       masked: 'false',
       protected: 'false',
+      secret_value: 'test_val',
       value: 'test_val',
       variable_type: 'env_var',
     });
@@ -29,6 +30,7 @@ describe('CI variables store utils', () => {
       key: 'test_var_2',
       masked: 'false',
       protected: 'false',
+      secret_value: 'test_val_2',
       value: 'test_val_2',
       variable_type: 'file',
     });
diff --git a/spec/frontend/contributors/store/getters_spec.js b/spec/frontend/contributors/store/getters_spec.js
index 62ae9b36f87..e6342a669b7 100644
--- a/spec/frontend/contributors/store/getters_spec.js
+++ b/spec/frontend/contributors/store/getters_spec.js
@@ -29,33 +29,39 @@ describe('Contributors Store Getters', () => {
 
       beforeAll(() => {
         state.chartData = [
+          { author_name: 'John Smith', author_email: 'jawnnypoo@gmail.com', date: '2019-05-05' },
           { author_name: 'John', author_email: 'jawnnypoo@gmail.com', date: '2019-05-05' },
-          { author_name: 'John', author_email: 'jawnnypoo@gmail.com', date: '2019-05-05' },
-          { author_name: 'Carlson', author_email: 'jawnnypoo@gmail.com', date: '2019-03-03' },
-          { author_name: 'Carlson', author_email: 'jawnnypoo@gmail.com', date: '2019-05-05' },
-          { author_name: 'John', author_email: 'jawnnypoo@gmail.com', date: '2019-04-04' },
+          { author_name: 'Carlson', author_email: 'carlson123@gitlab.com', date: '2019-03-03' },
+          { author_name: 'Carlson', author_email: 'carlson123@gmail.com', date: '2019-05-05' },
           { author_name: 'John', author_email: 'jawnnypoo@gmail.com', date: '2019-04-04' },
+          { author_name: 'Johan', author_email: 'jawnnypoo@gmail.com', date: '2019-04-04' },
           { author_name: 'John', author_email: 'jawnnypoo@gmail.com', date: '2019-03-03' },
         ];
         parsed = getters.parsedData(state);
       });
 
-      it('should group contributions by date ', () => {
+      it('should group contributions by date', () => {
         expect(parsed.total).toMatchObject({ '2019-05-05': 3, '2019-03-03': 2, '2019-04-04': 2 });
       });
 
-      it('should group contributions by author ', () => {
-        expect(parsed.byAuthor).toMatchObject({
-          Carlson: {
-            email: 'jawnnypoo@gmail.com',
-            commits: 2,
+      it('should group contributions by email and use most recent name', () => {
+        expect(parsed.byAuthorEmail).toMatchObject({
+          'carlson123@gmail.com': {
+            name: 'Carlson',
+            commits: 1,
             dates: {
-              '2019-03-03': 1,
               '2019-05-05': 1,
             },
           },
-          John: {
-            email: 'jawnnypoo@gmail.com',
+          'carlson123@gitlab.com': {
+            name: 'Carlson',
+            commits: 1,
+            dates: {
+              '2019-03-03': 1,
+            },
+          },
+          'jawnnypoo@gmail.com': {
+            name: 'John Smith',
             commits: 5,
             dates: {
               '2019-03-03': 1,
diff --git a/spec/frontend/reports/store/utils_spec.js b/spec/frontend/reports/store/utils_spec.js
index 0d9a8dd4585..9ae456658dc 100644
--- a/spec/frontend/reports/store/utils_spec.js
+++ b/spec/frontend/reports/store/utils_spec.js
@@ -30,9 +30,7 @@ describe('Reports store utils', () => {
       const data = { failed: 3, total: 10 };
       const result = utils.summaryTextBuilder(name, data);
 
-      expect(result).toBe(
-        'Test summary contained 3 failed/error test results out of 10 total tests',
-      );
+      expect(result).toBe('Test summary contained 3 failed out of 10 total tests');
     });
 
     it('should render text for multiple errored results', () => {
@@ -40,9 +38,7 @@ describe('Reports store utils', () => {
       const data = { errored: 7, total: 10 };
       const result = utils.summaryTextBuilder(name, data);
 
-      expect(result).toBe(
-        'Test summary contained 7 failed/error test results out of 10 total tests',
-      );
+      expect(result).toBe('Test summary contained 7 errors out of 10 total tests');
     });
 
     it('should render text for multiple fixed results', () => {
@@ -59,7 +55,7 @@ describe('Reports store utils', () => {
       const result = utils.summaryTextBuilder(name, data);
 
       expect(result).toBe(
-        'Test summary contained 3 failed/error test results and 4 fixed test results out of 10 total tests',
+        'Test summary contained 3 failed and 4 fixed test results out of 10 total tests',
       );
     });
 
@@ -69,18 +65,17 @@ describe('Reports store utils', () => {
       const result = utils.summaryTextBuilder(name, data);
 
       expect(result).toBe(
-        'Test summary contained 1 failed/error test result and 1 fixed test result out of 10 total tests',
+        'Test summary contained 1 failed and 1 fixed test result out of 10 total tests',
       );
     });
 
     it('should render text for singular failed, errored, and fixed results', () => {
-      // these will be singular when the copy is updated
       const name = 'Test summary';
       const data = { failed: 1, errored: 1, resolved: 1, total: 10 };
       const result = utils.summaryTextBuilder(name, data);
 
       expect(result).toBe(
-        'Test summary contained 2 failed/error test results and 1 fixed test result out of 10 total tests',
+        'Test summary contained 1 failed, 1 error and 1 fixed test result out of 10 total tests',
       );
     });
 
@@ -90,7 +85,7 @@ describe('Reports store utils', () => {
       const result = utils.summaryTextBuilder(name, data);
 
       expect(result).toBe(
-        'Test summary contained 5 failed/error test results and 4 fixed test results out of 10 total tests',
+        'Test summary contained 2 failed, 3 errors and 4 fixed test results out of 10 total tests',
       );
     });
   });
@@ -117,7 +112,7 @@ describe('Reports store utils', () => {
       const data = { failed: 3, total: 10 };
       const result = utils.reportTextBuilder(name, data);
 
-      expect(result).toBe('Rspec found 3 failed/error test results out of 10 total tests');
+      expect(result).toBe('Rspec found 3 failed out of 10 total tests');
     });
 
     it('should render text for multiple errored results', () => {
@@ -125,7 +120,7 @@ describe('Reports store utils', () => {
       const data = { errored: 7, total: 10 };
       const result = utils.reportTextBuilder(name, data);
 
-      expect(result).toBe('Rspec found 7 failed/error test results out of 10 total tests');
+      expect(result).toBe('Rspec found 7 errors out of 10 total tests');
     });
 
     it('should render text for multiple fixed results', () => {
@@ -141,9 +136,7 @@ describe('Reports store utils', () => {
       const data = { failed: 3, resolved: 4, total: 10 };
       const result = utils.reportTextBuilder(name, data);
 
-      expect(result).toBe(
-        'Rspec found 3 failed/error test results and 4 fixed test results out of 10 total tests',
-      );
+      expect(result).toBe('Rspec found 3 failed and 4 fixed test results out of 10 total tests');
     });
 
     it('should render text for a singular fixed, and a singular failed result', () => {
@@ -151,19 +144,16 @@ describe('Reports store utils', () => {
       const data = { failed: 1, resolved: 1, total: 10 };
       const result = utils.reportTextBuilder(name, data);
 
-      expect(result).toBe(
-        'Rspec found 1 failed/error test result and 1 fixed test result out of 10 total tests',
-      );
+      expect(result).toBe('Rspec found 1 failed and 1 fixed test result out of 10 total tests');
     });
 
     it('should render text for singular failed, errored, and fixed results', () => {
-      // these will be singular when the copy is updated
       const name = 'Rspec';
       const data = { failed: 1, errored: 1, resolved: 1, total: 10 };
       const result = utils.reportTextBuilder(name, data);
 
       expect(result).toBe(
-        'Rspec found 2 failed/error test results and 1 fixed test result out of 10 total tests',
+        'Rspec found 1 failed, 1 error and 1 fixed test result out of 10 total tests',
       );
     });
 
@@ -173,7 +163,7 @@ describe('Reports store utils', () => {
       const result = utils.reportTextBuilder(name, data);
 
       expect(result).toBe(
-        'Rspec found 5 failed/error test results and 4 fixed test results out of 10 total tests',
+        'Rspec found 2 failed, 3 errors and 4 fixed test results out of 10 total tests',
       );
     });
   });
diff --git a/spec/frontend/sidebar/mock_data.js b/spec/frontend/sidebar/mock_data.js
index c7e52eae9bd..3dde40260eb 100644
--- a/spec/frontend/sidebar/mock_data.js
+++ b/spec/frontend/sidebar/mock_data.js
@@ -204,7 +204,7 @@ const mockData = {
     },
     rootPath: '/',
     fullPath: '/gitlab-org/gitlab-shell',
-    id: 1,
+    iid: 1,
   },
   time: {
     time_estimate: 3600,
diff --git a/spec/javascripts/reports/components/grouped_test_reports_app_spec.js b/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
index 154aa881d2d..bafc47c952a 100644
--- a/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
+++ b/spec/javascripts/reports/components/grouped_test_reports_app_spec.js
@@ -84,12 +84,10 @@ describe('Grouped Test Reports App', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
         expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed/error test results out of 11 total tests',
+          'Test summary contained 2 failed out of 11 total tests',
         );
 
-        expect(vm.$el.textContent).toContain(
-          'rspec:pg found 2 failed/error test results out of 8 total tests',
-        );
+        expect(vm.$el.textContent).toContain('rspec:pg found 2 failed out of 8 total tests');
 
         expect(vm.$el.textContent).toContain('New');
         expect(vm.$el.textContent).toContain(
@@ -112,12 +110,10 @@ describe('Grouped Test Reports App', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
         expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed/error test results out of 11 total tests',
+          'Test summary contained 2 errors out of 11 total tests',
         );
 
-        expect(vm.$el.textContent).toContain(
-          'karma found 2 failed/error test results out of 3 total tests',
-        );
+        expect(vm.$el.textContent).toContain('karma found 2 errors out of 3 total tests');
 
         expect(vm.$el.textContent).toContain('New');
         expect(vm.$el.textContent).toContain(
@@ -140,17 +136,15 @@ describe('Grouped Test Reports App', () => {
       setTimeout(() => {
         expect(vm.$el.querySelector('.gl-spinner')).toBeNull();
         expect(vm.$el.querySelector('.js-code-text').textContent.trim()).toEqual(
-          'Test summary contained 2 failed/error test results and 2 fixed test results out of 11 total tests',
+          'Test summary contained 2 failed and 2 fixed test results out of 11 total tests',
         );
 
         expect(vm.$el.textContent).toContain(
-          'rspec:pg found 1 failed/error test result and 2 fixed test results out of 8 total tests',
+          'rspec:pg found 1 failed and 2 fixed test results out of 8 total tests',
         );
 
         expect(vm.$el.textContent).toContain('New');
-        expect(vm.$el.textContent).toContain(
-          ' java ant found 1 failed/error test result out of 3 total tests',
-        );
+        expect(vm.$el.textContent).toContain(' java ant found 1 failed out of 3 total tests');
         done();
       }, 0);
     });
diff --git a/spec/lib/gitlab/git/repository_spec.rb b/spec/lib/gitlab/git/repository_spec.rb
index cfe73ead9cc..a2326728679 100644
--- a/spec/lib/gitlab/git/repository_spec.rb
+++ b/spec/lib/gitlab/git/repository_spec.rb
@@ -2151,11 +2151,11 @@ describe Gitlab::Git::Repository, :seed_helper do
         'gitaly_address' => Gitlab.config.repositories.storages.default.gitaly_address,
         'path' => TestEnv::SECOND_STORAGE_PATH
       })
-      Gitlab::Shell.new.create_repository('test_second_storage', TEST_REPO_PATH, 'group/project')
+      new_repository.create_repository
     end
 
     after do
-      Gitlab::Shell.new.remove_repository('test_second_storage', TEST_REPO_PATH)
+      new_repository.remove
     end
 
     it 'mirrors the source repository' do
diff --git a/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb b/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
index 56ec6ec0f59..15058684229 100644
--- a/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
+++ b/spec/lib/gitlab/import_export/fast_hash_serializer_spec.rb
@@ -215,6 +215,14 @@ describe Gitlab::ImportExport::FastHashSerializer do
     expect(subject['boards'].first['lists']).not_to be_empty
   end
 
+  context 'relation ordering' do
+    it 'orders exported pipelines by primary key' do
+      expected_order = project.ci_pipelines.reorder(:id).ids
+
+      expect(subject['ci_pipelines'].pluck('id')).to eq(expected_order)
+    end
+  end
+
   def setup_project
     release = create(:release)
     group = create(:group)
@@ -246,6 +254,8 @@ describe Gitlab::ImportExport::FastHashSerializer do
     ci_build.pipeline.update(project: project)
     create(:commit_status, project: project, pipeline: ci_build.pipeline)
 
+    create_list(:ci_pipeline, 5, :success, project: project)
+
     create(:milestone, project: project)
     create(:discussion_note, noteable: issue, project: project)
     create(:note, noteable: merge_request, project: project)
diff --git a/spec/models/concerns/ci/has_ref_spec.rb b/spec/models/concerns/ci/has_ref_spec.rb
new file mode 100644
index 00000000000..b98f915018b
--- /dev/null
+++ b/spec/models/concerns/ci/has_ref_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::HasRef do
+  describe '#branch?' do
+    let(:build) { create(:ci_build) }
+
+    subject { build.branch? }
+
+    context 'is not a tag' do
+      before do
+        build.tag = false
+      end
+
+      it 'return true when tag is set to false' do
+        is_expected.to be_truthy
+      end
+
+      context 'when it was triggered by merge request' do
+        let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) }
+        let(:pipeline) { merge_request.pipelines_for_merge_request.first }
+        let(:build) { create(:ci_build, pipeline: pipeline) }
+
+        it 'returns false' do
+          is_expected.to be_falsy
+        end
+      end
+    end
+
+    context 'is not a tag' do
+      before do
+        build.tag = true
+      end
+
+      it 'return false when tag is set to true' do
+        is_expected.to be_falsey
+      end
+    end
+  end
+
+  describe '#git_ref' do
+    subject { build.git_ref }
+
+    context 'when tag is true' do
+      let(:build) { create(:ci_build, tag: true) }
+
+      it 'returns a tag ref' do
+        is_expected.to start_with(Gitlab::Git::TAG_REF_PREFIX)
+      end
+    end
+
+    context 'when tag is false' do
+      let(:build) { create(:ci_build, tag: false) }
+
+      it 'returns a branch ref' do
+        is_expected.to start_with(Gitlab::Git::BRANCH_REF_PREFIX)
+      end
+    end
+
+    context 'when tag is nil' do
+      let(:build) { create(:ci_build, tag: nil) }
+
+      it 'returns a branch ref' do
+        is_expected.to start_with(Gitlab::Git::BRANCH_REF_PREFIX)
+      end
+    end
+
+    context 'when it is triggered by a merge request' do
+      let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) }
+      let(:pipeline) { merge_request.pipelines_for_merge_request.first }
+      let(:build) { create(:ci_build, tag: false, pipeline: pipeline) }
+
+      it 'returns nil' do
+        is_expected.to be_nil
+      end
+    end
+  end
+end
diff --git a/spec/models/concerns/has_ref_spec.rb b/spec/models/concerns/has_ref_spec.rb
deleted file mode 100644
index 66b25c77430..00000000000
--- a/spec/models/concerns/has_ref_spec.rb
+++ /dev/null
@@ -1,79 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe HasRef do
-  describe '#branch?' do
-    let(:build) { create(:ci_build) }
-
-    subject { build.branch? }
-
-    context 'is not a tag' do
-      before do
-        build.tag = false
-      end
-
-      it 'return true when tag is set to false' do
-        is_expected.to be_truthy
-      end
-
-      context 'when it was triggered by merge request' do
-        let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) }
-        let(:pipeline) { merge_request.pipelines_for_merge_request.first }
-        let(:build) { create(:ci_build, pipeline: pipeline) }
-
-        it 'returns false' do
-          is_expected.to be_falsy
-        end
-      end
-    end
-
-    context 'is not a tag' do
-      before do
-        build.tag = true
-      end
-
-      it 'return false when tag is set to true' do
-        is_expected.to be_falsey
-      end
-    end
-  end
-
-  describe '#git_ref' do
-    subject { build.git_ref }
-
-    context 'when tag is true' do
-      let(:build) { create(:ci_build, tag: true) }
-
-      it 'returns a tag ref' do
-        is_expected.to start_with(Gitlab::Git::TAG_REF_PREFIX)
-      end
-    end
-
-    context 'when tag is false' do
-      let(:build) { create(:ci_build, tag: false) }
-
-      it 'returns a branch ref' do
-        is_expected.to start_with(Gitlab::Git::BRANCH_REF_PREFIX)
-      end
-    end
-
-    context 'when tag is nil' do
-      let(:build) { create(:ci_build, tag: nil) }
-
-      it 'returns a branch ref' do
-        is_expected.to start_with(Gitlab::Git::BRANCH_REF_PREFIX)
-      end
-    end
-
-    context 'when it is triggered by a merge request' do
-      let(:merge_request) { create(:merge_request, :with_detached_merge_request_pipeline) }
-      let(:pipeline) { merge_request.pipelines_for_merge_request.first }
-      let(:build) { create(:ci_build, tag: false, pipeline: pipeline) }
-
-      it 'returns nil' do
-        is_expected.to be_nil
-      end
-    end
-  end
-end
diff --git a/spec/requests/api/pipelines_spec.rb b/spec/requests/api/pipelines_spec.rb
index b38b92af139..6b824690e6c 100644
--- a/spec/requests/api/pipelines_spec.rb
+++ b/spec/requests/api/pipelines_spec.rb
@@ -254,7 +254,9 @@ describe API::Pipelines do
         context 'when order_by and sort are specified' do
           context 'when order_by user_id' do
             before do
-              create_list(:ci_pipeline, 3, project: project, user: create(:user))
+              create_list(:user, 3).each do |some_user|
+                create(:ci_pipeline, project: project, user: some_user)
+              end
             end
 
             context 'when sort parameter is valid' do
diff --git a/spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb b/spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb
new file mode 100644
index 00000000000..75a1f939a9f
--- /dev/null
+++ b/spec/rubocop/cop/migration/with_lock_retries_with_change_spec.rb
@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+require 'rubocop'
+require 'rubocop/rspec/support'
+
+require_relative '../../../../rubocop/cop/migration/with_lock_retries_with_change'
+
+describe RuboCop::Cop::Migration::WithLockRetriesWithChange do
+  include CopHelper
+
+  subject(:cop) { described_class.new }
+
+  context 'in migration' do
+    before do
+      allow(cop).to receive(:in_migration?).and_return(true)
+    end
+
+    it 'registers an offense when `with_lock_retries` is used inside a `change` method' do
+      inspect_source('def change; with_lock_retries {}; end')
+
+      aggregate_failures do
+        expect(cop.offenses.size).to eq(1)
+        expect(cop.offenses.map(&:line)).to eq([1])
+      end
+    end
+
+    it 'registers no offense when `with_lock_retries` is used inside an `up` method' do
+      inspect_source('def up; with_lock_retries {}; end')
+
+      expect(cop.offenses.size).to eq(0)
+    end
+  end
+
+  context 'outside of migration' do
+    it 'registers no offense' do
+      inspect_source('def change; with_lock_retries {}; end')
+
+      expect(cop.offenses.size).to eq(0)
+    end
+  end
+end
diff --git a/spec/serializers/group_variable_entity_spec.rb b/spec/serializers/group_variable_entity_spec.rb
index 22c98b418dd..e6b51e0d626 100644
--- a/spec/serializers/group_variable_entity_spec.rb
+++ b/spec/serializers/group_variable_entity_spec.rb
@@ -10,7 +10,7 @@ describe GroupVariableEntity do
     subject { entity.as_json }
 
     it 'contains required fields' do
-      expect(subject).to include(:id, :key, :value, :protected)
+      expect(subject).to include(:id, :key, :value, :protected, :variable_type)
     end
   end
 end
diff --git a/spec/support/matchers/exceed_query_limit.rb b/spec/support/matchers/exceed_query_limit.rb
index 40cf85eb8e5..f38ae44a577 100644
--- a/spec/support/matchers/exceed_query_limit.rb
+++ b/spec/support/matchers/exceed_query_limit.rb
@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module ExceedQueryLimitHelpers
+  MARGINALIA_ANNOTATION_REGEX = %r{\s*\/\*.*\*\/}.freeze
+
   def with_threshold(threshold)
     @threshold = threshold
     self
@@ -41,8 +43,8 @@ module ExceedQueryLimitHelpers
 
   def log_message
     if expected.is_a?(ActiveRecord::QueryRecorder)
-      counts = count_queries(expected.log)
-      extra_queries = @recorder.log.reject { |query| counts[query] -= 1 unless counts[query].zero? }
+      counts = count_queries(strip_marginalia_annotations(expected.log))
+      extra_queries = strip_marginalia_annotations(@recorder.log).reject { |query| counts[query] -= 1 unless counts[query].zero? }
       extra_queries_display = count_queries(extra_queries).map { |query, count| "[#{count}] #{query}" }
 
       (['Extra queries:'] + extra_queries_display).join("\n\n")
@@ -65,6 +67,10 @@ module ExceedQueryLimitHelpers
     counts = "#{expected_count}#{threshold_message}"
     "Expected a maximum of #{counts} queries, got #{actual_count}:\n\n#{log_message}"
   end
+
+  def strip_marginalia_annotations(logs)
+    logs.map { |log| log.sub(MARGINALIA_ANNOTATION_REGEX, '') }
+  end
 end
 
 RSpec::Matchers.define :exceed_all_query_limit do |expected|
diff --git a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
new file mode 100644
index 00000000000..3b15d804d7c
--- /dev/null
+++ b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe ExceedQueryLimitHelpers do
+  class TestQueries < ActiveRecord::Base
+    self.table_name = 'schema_migrations'
+  end
+
+  class TestMatcher
+    include ExceedQueryLimitHelpers
+
+    def expected
+      ActiveRecord::QueryRecorder.new do
+        2.times { TestQueries.count }
+      end
+    end
+  end
+
+  it 'does not contain marginalia annotations' do
+    test_matcher = TestMatcher.new
+    test_matcher.verify_count do
+      2.times { TestQueries.count }
+      TestQueries.first
+    end
+
+    aggregate_failures do
+      expect(test_matcher.log_message)
+        .to match(%r{ORDER BY.*#{TestQueries.table_name}.*LIMIT 1})
+      expect(test_matcher.log_message)
+        .not_to match(%r{\/\*.*correlation_id.*\*\/})
+    end
+  end
+end
-- 
cgit v1.2.3