From da50206243972a4cafcaea7539aed7c6986c775e Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Thu, 27 Aug 2020 18:10:29 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .gitlab/ci/reports.gitlab-ci.yml | 8 +- .gitlab/issue_templates/Bug.md | 26 +- .../design_management_legacy/pages/index.vue | 2 +- .../components/graph/graph_component.vue | 3 +- app/controllers/projects/todos_controller.rb | 3 + app/finders/concerns/finder_methods.rb | 11 +- .../design_management/designs_finder.rb | 1 + app/helpers/system_note_helper.rb | 3 +- app/models/ci_platform_metric.rb | 27 + app/models/issue.rb | 16 + app/models/system_note_metadata.rb | 2 +- .../process_prometheus_alert_service.rb | 83 +- .../projects/alerting/notify_service.rb | 1 + app/services/system_note_service.rb | 4 + .../system_notes/alert_management_service.rb | 15 + .../projects/pipelines/_with_tabs.html.haml | 2 +- .../225820-create-system-note-alert.yml | 5 + ...-remove-secret-sast-from-sast-template.yml | 5 + changelogs/unreleased/ci-platform-metrics.yml | 5 + .../unreleased/fix-css-pipeline-graph.yml | 5 + ...200820204041_create_ci_platform_metrics.rb | 27 + db/schema_migrations/20200820204041 | 1 + db/structure.sql | 24 + doc/administration/gitaly/praefect.md | 32 +- doc/api/groups.md | 23 + doc/api/project_repository_storage_moves.md | 18 +- doc/development/documentation/styleguide.md | 1007 ++++++++++------- .../coverage_fuzzing/index.md | 8 +- .../application_security/sast/analyzers.md | 1 - doc/user/application_security/sast/index.md | 6 - .../compliance/license_compliance/index.md | 26 - lib/gitlab/alert_management/payload/base.rb | 12 +- .../alert_management/payload/prometheus.rb | 4 + .../ci/templates/Security/SAST.gitlab-ci.yml | 14 +- locale/gitlab.pot | 3 + package.json | 2 +- .../settings/mirroring_repositories.rb | 2 +- .../projects/todos_controller_spec.rb | 35 +- spec/factories/ci_platform_metrics.rb | 9 + spec/finders/concerns/finder_methods_spec.rb | 6 +- .../design_management/pages/index_spec.js | 14 +- .../pages/index_spec.js | 23 +- spec/frontend/helpers/local_storage_helper.js | 2 +- .../helpers/local_storage_helper_spec.js | 9 +- .../ide/sync_router_and_store_spec.js | 8 +- .../alert_management/payload/base_spec.rb | 32 + .../payload/prometheus_spec.rb | 33 + spec/models/ci_platform_metric_spec.rb | 70 ++ spec/models/issue_spec.rb | 28 + .../process_prometheus_alert_service_spec.rb | 28 +- .../ci/create_pipeline_service_spec.rb | 2 +- spec/services/notification_service_spec.rb | 31 +- .../projects/alerting/notify_service_spec.rb | 4 + spec/services/system_note_service_spec.rb | 13 + .../alert_management_service_spec.rb | 13 + yarn.lock | 8 +- 56 files changed, 1197 insertions(+), 608 deletions(-) create mode 100644 app/models/ci_platform_metric.rb create mode 100644 changelogs/unreleased/225820-create-system-note-alert.yml create mode 100644 changelogs/unreleased/234011-remove-secret-sast-from-sast-template.yml create mode 100644 changelogs/unreleased/ci-platform-metrics.yml create mode 100644 changelogs/unreleased/fix-css-pipeline-graph.yml create mode 100644 db/migrate/20200820204041_create_ci_platform_metrics.rb create mode 100644 db/schema_migrations/20200820204041 create mode 100644 spec/factories/ci_platform_metrics.rb create mode 100644 spec/models/ci_platform_metric_spec.rb diff --git a/.gitlab/ci/reports.gitlab-ci.yml b/.gitlab/ci/reports.gitlab-ci.yml index 54b6b1f47eb..0e2f12789db 100644 --- a/.gitlab/ci/reports.gitlab-ci.yml +++ b/.gitlab/ci/reports.gitlab-ci.yml @@ -81,7 +81,13 @@ nodejs-scan-sast: secrets-sast: extends: .sast image: - name: "$SAST_ANALYZER_IMAGE_PREFIX/secrets:$SAST_ANALYZER_IMAGE_TAG" + name: "$SAST_ANALYZER_IMAGE_PREFIX/secrets:3" + artifacts: + paths: + - gl-secret-detection-report.json # GitLab-specific + reports: + sast: gl-secret-detection-report.json + expire_in: 1 week # GitLab-specific # We need to duplicate this job's definition because it seems it's impossible to # override an included `only.refs`. diff --git a/.gitlab/issue_templates/Bug.md b/.gitlab/issue_templates/Bug.md index 037f83c93d2..41b694fdf2c 100644 --- a/.gitlab/issue_templates/Bug.md +++ b/.gitlab/issue_templates/Bug.md @@ -12,37 +12,39 @@ and verify the issue you're about to submit isn't a duplicate. ### Summary -(Summarize the bug encountered concisely) + ### Steps to reproduce -(How one can reproduce the issue - this is very important) + ### Example Project -(If possible, please create an example project here on GitLab.com that exhibits the problematic behavior, and link to it here in the bug report) - -(If you are using an older version of GitLab, this will also determine whether the bug is fixed in a more recent version) + ### What is the current *bug* behavior? -(What actually happens) + ### What is the expected *correct* behavior? -(What you should see instead) + ### Relevant logs and/or screenshots -(Paste any relevant logs - please use code blocks (```) to format console output, -logs, and code as it's tough to read otherwise.) + ### Output of checks -(If you are reporting a bug on GitLab.com, write: This bug happens on GitLab.com) + #### Results of GitLab environment info + +
Expand for output related to GitLab environment info @@ -59,6 +61,8 @@ logs, and code as it's tough to read otherwise.) #### Results of GitLab application Check + +
Expand for output related to the GitLab application check 
@@ -76,6 +80,6 @@ logs, and code as it's tough to read otherwise.)
 
 ### Possible fixes
 
-(If you can, link to the line of code that might be responsible for the problem)
+
 
 /label ~bug
diff --git a/app/assets/javascripts/design_management_legacy/pages/index.vue b/app/assets/javascripts/design_management_legacy/pages/index.vue
index 66008a193ce..81532d75b7d 100644
--- a/app/assets/javascripts/design_management_legacy/pages/index.vue
+++ b/app/assets/javascripts/design_management_legacy/pages/index.vue
@@ -168,7 +168,7 @@ export default {
 
       // if this upload resulted in a new version being created, redirect user to the latest version
       if (!this.isLatestVersion) {
-        this.$router.push({ name: DESIGNS_ROUTE_NAME });
+        this.$router.push({ name: DESIGNS_ROUTE_NAME }, () => {});
       }
       this.resetFilesToBeSaved();
     },
diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
index ed40dfbfde1..f5bf6a6ed34 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -131,7 +131,8 @@ export default {
     >
       

         
diff --git a/app/controllers/projects/todos_controller.rb b/app/controllers/projects/todos_controller.rb
index 0b11ee9edc0..33205b93317 100644
--- a/app/controllers/projects/todos_controller.rb
+++ b/app/controllers/projects/todos_controller.rb
@@ -15,6 +15,9 @@ class Projects::TodosController < Projects::ApplicationController
         IssuesFinder.new(current_user, project_id: @project.id).find(params[:issuable_id])
       when "merge_request"
         MergeRequestsFinder.new(current_user, project_id: @project.id).find(params[:issuable_id])
+      when "design"
+        issue = IssuesFinder.new(current_user, project_id: @project.id).find(params[:issue_id])
+        DesignManagement::DesignsFinder.new(issue, current_user).find(params[:issuable_id])
       end
     end
   end
diff --git a/app/finders/concerns/finder_methods.rb b/app/finders/concerns/finder_methods.rb
index 8de3276184d..622cbcf4928 100644
--- a/app/finders/concerns/finder_methods.rb
+++ b/app/finders/concerns/finder_methods.rb
@@ -30,7 +30,7 @@ module FinderMethods
   def if_authorized(result)
     # Return the result if the finder does not perform authorization checks.
     # this is currently the case in the `MilestoneFinder`
-    return result unless respond_to?(:current_user)
+    return result unless respond_to?(:current_user, true)
 
     if can_read_object?(result)
       result
@@ -44,9 +44,14 @@ module FinderMethods
     # for Todos
     return true unless DeclarativePolicy.has_policy?(object)
 
-    model_name = object&.model_name || model.model_name
+    Ability.allowed?(current_user, :"read_#{to_ability_name(object)}", object)
+  end
 
-    Ability.allowed?(current_user, :"read_#{model_name.singular}", object)
+  def to_ability_name(object)
+    return object.to_ability_name if object.respond_to?(:to_ability_name)
+
+    # Not all objects define `#to_ability_name`, so attempt to derive it:
+    object.model_name.singular
   end
 
   # This fetches the model from the `ActiveRecord::Relation` but does not
diff --git a/app/finders/design_management/designs_finder.rb b/app/finders/design_management/designs_finder.rb
index d9732f6b6f4..6673103e146 100644
--- a/app/finders/design_management/designs_finder.rb
+++ b/app/finders/design_management/designs_finder.rb
@@ -3,6 +3,7 @@
 module DesignManagement
   class DesignsFinder
     include Gitlab::Allowable
+    include FinderMethods
 
     # Params:
     # ids: integer[]
diff --git a/app/helpers/system_note_helper.rb b/app/helpers/system_note_helper.rb
index 6ea6a33ba5e..4bbfa499919 100644
--- a/app/helpers/system_note_helper.rb
+++ b/app/helpers/system_note_helper.rb
@@ -33,7 +33,8 @@ module SystemNoteHelper
     'designs_removed' => 'doc-image',
     'designs_discussion_added' => 'doc-image',
     'status' => 'status',
-    'alert_issue_added' => 'issues'
+    'alert_issue_added' => 'issues',
+    'new_alert_added' => 'warning'
   }.freeze
 
   def system_note_icon_name(note)
diff --git a/app/models/ci_platform_metric.rb b/app/models/ci_platform_metric.rb
new file mode 100644
index 00000000000..2c72296cdb8
--- /dev/null
+++ b/app/models/ci_platform_metric.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class CiPlatformMetric < ApplicationRecord
+  validates :recorded_at, presence: true
+  validates :platform_target, presence: true, length: { maximum: 255 }
+  validates :count, presence: true
+
+  CI_VARIABLE_KEY = "AUTO_DEVOPS_PLATFORM_TARGET"
+
+  def self.update!
+    # This work can NOT be done in-database because value is encrypted.
+    # However, for "AUTO_DEVOPS_PLATFORM_TARGET", these values are only
+    # encrypted as a matter of course, rather than as a need for secrecy.
+    # So this is not a security risk, but exposing other keys possibly could be.
+    variables = Ci::Variable.by_key(CI_VARIABLE_KEY)
+    update_recorded_at = Time.zone.now
+    counts = variables.group_by(&:value).map do |value, variables|
+      {
+        recorded_at: update_recorded_at,
+        platform_target: value,
+        count: variables.count
+      }
+    end
+
+    create(counts)
+  end
+end
diff --git a/app/models/issue.rb b/app/models/issue.rb
index ba7c9c1e5c2..4044ad9cf21 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -440,6 +440,22 @@ class Issue < ApplicationRecord
     key = Gitlab::Routing.url_helpers.realtime_changes_project_issue_path(project, self)
     Gitlab::EtagCaching::Store.new.touch(key)
   end
+
+  def find_next_gap_before
+    super
+  rescue ActiveRecord::QueryCanceled => e
+    # Symptom of running out of space - schedule rebalancing
+    IssueRebalancingWorker.perform_async(id)
+    raise e
+  end
+
+  def find_next_gap_after
+    super
+  rescue ActiveRecord::QueryCanceled => e
+    # Symptom of running out of space - schedule rebalancing
+    IssueRebalancingWorker.perform_async(id)
+    raise e
+  end
 end
 
 Issue.prepend_if_ee('EE::Issue')
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index f464939fa42..961212d0295 100644
--- a/app/models/system_note_metadata.rb
+++ b/app/models/system_note_metadata.rb
@@ -20,7 +20,7 @@ class SystemNoteMetadata < ApplicationRecord
     title time_tracking branch milestone discussion task moved
     opened closed merged duplicate locked unlocked outdated
     tag due_date pinned_embed cherry_pick health_status approved unapproved
-    status alert_issue_added relate unrelate
+    status alert_issue_added relate unrelate new_alert_added
   ].freeze
 
   validates :note, presence: true
diff --git a/app/services/alert_management/process_prometheus_alert_service.rb b/app/services/alert_management/process_prometheus_alert_service.rb
index 6ed5bd6726f..402248931cc 100644
--- a/app/services/alert_management/process_prometheus_alert_service.rb
+++ b/app/services/alert_management/process_prometheus_alert_service.rb
@@ -6,7 +6,7 @@ module AlertManagement
     include ::IncidentManagement::Settings
 
     def execute
-      return bad_request unless parsed_alert.valid?
+      return bad_request unless incoming_payload.has_required_attributes?
 
       process_alert_management_alert
 
@@ -15,22 +15,17 @@ module AlertManagement
 
     private
 
-    delegate :firing?, :resolved?, :gitlab_fingerprint, :ends_at, to: :parsed_alert
-
-    def parsed_alert
-      strong_memoize(:parsed_alert) do
-        Gitlab::Alerting::Alert.new(project: project, payload: params)
+    def process_alert_management_alert
+      if incoming_payload.resolved?
+        process_resolved_alert_management_alert
+      else
+        process_firing_alert_management_alert
       end
     end
 
-    def process_alert_management_alert
-      process_firing_alert_management_alert if firing?
-      process_resolved_alert_management_alert if resolved?
-    end
-
     def process_firing_alert_management_alert
-      if am_alert.present?
-        am_alert.register_new_event!
+      if alert.persisted?
+        alert.register_new_event!
         reset_alert_management_alert_status
       else
         create_alert_management_alert
@@ -40,47 +35,42 @@ module AlertManagement
     end
 
     def reset_alert_management_alert_status
-      return if am_alert.trigger
+      return if alert.trigger
 
       logger.warn(
         message: 'Unable to update AlertManagement::Alert status to triggered',
         project_id: project.id,
-        alert_id: am_alert.id
+        alert_id: alert.id
       )
     end
 
     def create_alert_management_alert
-      new_alert = AlertManagement::Alert.new(am_alert_params.merge(ended_at: nil))
-      if new_alert.save
-        new_alert.execute_services
-        @am_alert = new_alert
+      if alert.save
+        alert.execute_services
+        SystemNoteService.create_new_alert(alert, Gitlab::AlertManagement::AlertParams::MONITORING_TOOLS[:prometheus])
         return
       end
 
       logger.warn(
         message: 'Unable to create AlertManagement::Alert',
         project_id: project.id,
-        alert_errors: new_alert.errors.messages
+        alert_errors: alert.errors.messages
       )
     end
 
-    def am_alert_params
-      Gitlab::AlertManagement::AlertParams.from_prometheus_alert(project: project, parsed_alert: parsed_alert)
-    end
-
     def process_resolved_alert_management_alert
-      return if am_alert.blank?
+      return unless alert.persisted?
       return unless auto_close_incident?
 
-      if am_alert.resolve(ends_at)
-        close_issue(am_alert.issue)
+      if alert.resolve(incoming_payload.ends_at)
+        close_issue(alert.issue)
         return
       end
 
       logger.warn(
         message: 'Unable to update AlertManagement::Alert status to resolved',
         project_id: project.id,
-        alert_id: am_alert.id
+        alert_id: alert.id
       )
     end
 
@@ -95,19 +85,44 @@ module AlertManagement
     end
 
     def process_incident_alert
-      return unless am_alert
-      return if am_alert.issue
+      return unless alert.persisted?
+      return if alert.issue
 
-      IncidentManagement::ProcessAlertWorker.perform_async(nil, nil, am_alert.id)
+      IncidentManagement::ProcessAlertWorker.perform_async(nil, nil, alert.id)
     end
 
     def logger
       @logger ||= Gitlab::AppLogger
     end
 
-    def am_alert
-      strong_memoize(:am_alert) do
-        AlertManagement::Alert.not_resolved.for_fingerprint(project, gitlab_fingerprint).first
+    def alert
+      strong_memoize(:alert) do
+        existing_alert || new_alert
+      end
+    end
+
+    def existing_alert
+      strong_memoize(:existing_alert) do
+        AlertManagement::Alert.not_resolved.for_fingerprint(project, incoming_payload.gitlab_fingerprint).first
+      end
+    end
+
+    def new_alert
+      strong_memoize(:new_alert) do
+        AlertManagement::Alert.new(
+          **incoming_payload.alert_params,
+          ended_at: nil
+        )
+      end
+    end
+
+    def incoming_payload
+      strong_memoize(:incoming_payload) do
+        Gitlab::AlertManagement::Payload.parse(
+          project,
+          params,
+          monitoring_tool: Gitlab::AlertManagement::Payload::MONITORING_TOOLS[:prometheus]
+        )
       end
     end
 
diff --git a/app/services/projects/alerting/notify_service.rb b/app/services/projects/alerting/notify_service.rb
index f883c8c7bd8..1716618f4b9 100644
--- a/app/services/projects/alerting/notify_service.rb
+++ b/app/services/projects/alerting/notify_service.rb
@@ -48,6 +48,7 @@ module Projects
       def create_alert
         alert = AlertManagement::Alert.create(am_alert_params)
         alert.execute_services if alert.persisted?
+        SystemNoteService.create_new_alert(alert, 'Generic Alert Endpoint')
 
         alert
       end
diff --git a/app/services/system_note_service.rb b/app/services/system_note_service.rb
index 7be94d8020e..1a041b8ecd8 100644
--- a/app/services/system_note_service.rb
+++ b/app/services/system_note_service.rb
@@ -308,6 +308,10 @@ module SystemNoteService
     ::SystemNotes::AlertManagementService.new(noteable: alert, project: alert.project, author: author).new_alert_issue(issue)
   end
 
+  def create_new_alert(alert, monitoring_tool)
+    ::SystemNotes::AlertManagementService.new(noteable: alert, project: alert.project).create_new_alert(monitoring_tool)
+  end
+
   private
 
   def merge_requests_service(noteable, project, author)
diff --git a/app/services/system_notes/alert_management_service.rb b/app/services/system_notes/alert_management_service.rb
index f835376727a..376f2c1cfbf 100644
--- a/app/services/system_notes/alert_management_service.rb
+++ b/app/services/system_notes/alert_management_service.rb
@@ -2,6 +2,21 @@
 
 module SystemNotes
   class AlertManagementService < ::SystemNotes::BaseService
+    # Called when the a new AlertManagement::Alert has been created
+    #
+    # alert - AlertManagement::Alert object.
+    #
+    # Example Note text:
+    #
+    #   "GitLab Alert Bot logged an alert from Prometheus"
+    #
+    # Returns the created Note object
+    def create_new_alert(monitoring_tool)
+      body = "logged an alert from **#{monitoring_tool}**"
+
+      create_note(NoteSummary.new(noteable, project, User.alert_bot, body, action: 'new_alert_added'))
+    end
+
     # Called when the status of an AlertManagement::Alert has changed
     #
     # alert - AlertManagement::Alert object.
diff --git a/app/views/projects/pipelines/_with_tabs.html.haml b/app/views/projects/pipelines/_with_tabs.html.haml
index 905b7699579..f1ed67f8f82 100644
--- a/app/views/projects/pipelines/_with_tabs.html.haml
+++ b/app/views/projects/pipelines/_with_tabs.html.haml
@@ -26,7 +26,7 @@
     = render_if_exists "projects/pipelines/tabs_holder", pipeline: @pipeline, project: @project
 
 .tab-content
-  #js-tab-pipeline.tab-pane.w-1000
+  #js-tab-pipeline.tab-pane.gl-absolute.gl-left-0.gl-w-full
     #js-pipeline-graph-vue
 
   #js-tab-builds.tab-pane
diff --git a/changelogs/unreleased/225820-create-system-note-alert.yml b/changelogs/unreleased/225820-create-system-note-alert.yml
new file mode 100644
index 00000000000..3c088c25977
--- /dev/null
+++ b/changelogs/unreleased/225820-create-system-note-alert.yml
@@ -0,0 +1,5 @@
+---
+title: Add a system note on Alert creation
+merge_request: 40128
+author:
+type: added
diff --git a/changelogs/unreleased/234011-remove-secret-sast-from-sast-template.yml b/changelogs/unreleased/234011-remove-secret-sast-from-sast-template.yml
new file mode 100644
index 00000000000..2f37732ecc6
--- /dev/null
+++ b/changelogs/unreleased/234011-remove-secret-sast-from-sast-template.yml
@@ -0,0 +1,5 @@
+---
+title: Remove secret_detection job from vendored SAST CI template
+merge_request: 40028
+author:
+type: removed
diff --git a/changelogs/unreleased/ci-platform-metrics.yml b/changelogs/unreleased/ci-platform-metrics.yml
new file mode 100644
index 00000000000..e197b8e5345
--- /dev/null
+++ b/changelogs/unreleased/ci-platform-metrics.yml
@@ -0,0 +1,5 @@
+---
+title: Adds CI Platform Metrics bookkeeping model
+merge_request: 40036
+author:
+type: added
diff --git a/changelogs/unreleased/fix-css-pipeline-graph.yml b/changelogs/unreleased/fix-css-pipeline-graph.yml
new file mode 100644
index 00000000000..bf554ac0d70
--- /dev/null
+++ b/changelogs/unreleased/fix-css-pipeline-graph.yml
@@ -0,0 +1,5 @@
+---
+title: Fix the broken CSS on the pipeline graph
+merge_request: 40386
+author:
+type: fixed
diff --git a/db/migrate/20200820204041_create_ci_platform_metrics.rb b/db/migrate/20200820204041_create_ci_platform_metrics.rb
new file mode 100644
index 00000000000..df2efa7cf26
--- /dev/null
+++ b/db/migrate/20200820204041_create_ci_platform_metrics.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+class CreateCiPlatformMetrics < ActiveRecord::Migration[6.0]
+  include Gitlab::Database::MigrationHelpers
+
+  DOWNTIME = false
+
+  disable_ddl_transaction!
+
+  def up
+    unless table_exists?(:ci_platform_metrics)
+      create_table :ci_platform_metrics do |t|
+        t.datetime_with_timezone :recorded_at, null: false
+        t.text :platform_target, null: false
+        t.integer :count, null: false
+      end
+    end
+
+    add_text_limit :ci_platform_metrics, :platform_target, 255
+    add_concurrent_index :ci_variables, :key
+  end
+
+  def down
+    drop_table :ci_platform_metrics
+    remove_concurrent_index :ci_variables, :key
+  end
+end
diff --git a/db/schema_migrations/20200820204041 b/db/schema_migrations/20200820204041
new file mode 100644
index 00000000000..43e564a759d
--- /dev/null
+++ b/db/schema_migrations/20200820204041
@@ -0,0 +1 @@
+ce4d108c6587943ab3740dcc39298d6877d7317ec1023d8d263cecd9f1e0f478
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index 78f9726f0a0..6242b27dbe1 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -10233,6 +10233,23 @@ CREATE SEQUENCE public.ci_pipelines_id_seq
 
 ALTER SEQUENCE public.ci_pipelines_id_seq OWNED BY public.ci_pipelines.id;
 
+CREATE TABLE public.ci_platform_metrics (
+    id bigint NOT NULL,
+    recorded_at timestamp with time zone NOT NULL,
+    platform_target text NOT NULL,
+    count integer NOT NULL,
+    CONSTRAINT check_f922abc32b CHECK ((char_length(platform_target) <= 255))
+);
+
+CREATE SEQUENCE public.ci_platform_metrics_id_seq
+    START WITH 1
+    INCREMENT BY 1
+    NO MINVALUE
+    NO MAXVALUE
+    CACHE 1;
+
+ALTER SEQUENCE public.ci_platform_metrics_id_seq OWNED BY public.ci_platform_metrics.id;
+
 CREATE TABLE public.ci_refs (
     id bigint NOT NULL,
     project_id bigint NOT NULL,
@@ -16857,6 +16874,8 @@ ALTER TABLE ONLY public.ci_pipelines ALTER COLUMN id SET DEFAULT nextval('public
 
 ALTER TABLE ONLY public.ci_pipelines_config ALTER COLUMN pipeline_id SET DEFAULT nextval('public.ci_pipelines_config_pipeline_id_seq'::regclass);
 
+ALTER TABLE ONLY public.ci_platform_metrics ALTER COLUMN id SET DEFAULT nextval('public.ci_platform_metrics_id_seq'::regclass);
+
 ALTER TABLE ONLY public.ci_refs ALTER COLUMN id SET DEFAULT nextval('public.ci_refs_id_seq'::regclass);
 
 ALTER TABLE ONLY public.ci_resource_groups ALTER COLUMN id SET DEFAULT nextval('public.ci_resource_groups_id_seq'::regclass);
@@ -17821,6 +17840,9 @@ ALTER TABLE ONLY public.ci_pipelines_config
 ALTER TABLE ONLY public.ci_pipelines
     ADD CONSTRAINT ci_pipelines_pkey PRIMARY KEY (id);
 
+ALTER TABLE ONLY public.ci_platform_metrics
+    ADD CONSTRAINT ci_platform_metrics_pkey PRIMARY KEY (id);
+
 ALTER TABLE ONLY public.ci_refs
     ADD CONSTRAINT ci_refs_pkey PRIMARY KEY (id);
 
@@ -19403,6 +19425,8 @@ CREATE INDEX index_ci_triggers_on_owner_id ON public.ci_triggers USING btree (ow
 
 CREATE INDEX index_ci_triggers_on_project_id ON public.ci_triggers USING btree (project_id);
 
+CREATE INDEX index_ci_variables_on_key ON public.ci_variables USING btree (key);
+
 CREATE UNIQUE INDEX index_ci_variables_on_project_id_and_key_and_environment_scope ON public.ci_variables USING btree (project_id, key, environment_scope);
 
 CREATE INDEX index_cluster_agent_tokens_on_agent_id ON public.cluster_agent_tokens USING btree (agent_id);
diff --git a/doc/administration/gitaly/praefect.md b/doc/administration/gitaly/praefect.md
index c31fa735094..9be5d555baa 100644
--- a/doc/administration/gitaly/praefect.md
+++ b/doc/administration/gitaly/praefect.md
@@ -379,7 +379,7 @@ application server, or a Gitaly node.
    CAUTION: **Caution:**
    If you have data on an already existing storage called
    `default`, you should configure the virtual storage with another name and
-   [migrate the data to the Praefect storage](#migrating-existing-repositories-to-praefect)
+   [migrate the data to the Gitaly Cluster storage](#migrate-existing-repositories-to-gitaly-cluster)
    afterwards.
 
    Replace `PRAEFECT_INTERNAL_TOKEN` with a strong secret, which will be used by
@@ -802,7 +802,8 @@ Particular attention should be shown to:
 
    CAUTION: **Caution:**
    If you have existing data stored on the default Gitaly storage,
-   you should [migrate the data your Praefect storage first](#migrating-existing-repositories-to-praefect).
+   you should [migrate the data your Gitaly Cluster storage](#migrate-existing-repositories-to-gitaly-cluster)
+   first.
 
    ```ruby
    gitaly['enable'] = false
@@ -1230,17 +1231,30 @@ The command will return a list of repositories that were found to be
 inconsistent against the current primary. Each of these inconsistencies will
 also be logged with an accompanying replication job ID.
 
-## Migrating existing repositories to Praefect
+## Migrate existing repositories to Gitaly Cluster
 
-If your GitLab instance already has repositories, these won't be migrated
-automatically.
+If your GitLab instance already has repositories on single Gitaly nodes, these aren't migrated to
+Gitaly Cluster automatically.
 
 Repositories may be moved from one storage location using the [Project repository storage moves API](../../api/project_repository_storage_moves.md):
 
-```shell
-curl --request POST --header "Private-Token: " --header "Content-Type: application/json" \
---data '{"destination_storage_name":"praefect"}' "https://gitlab.example.com/api/v4/projects/123/repository_storage_moves"
-```
+To move repositories to Gitaly Cluster:
+
+1. [Schedule a move](../../api/project_repository_storage_moves.md#schedule-a-repository-storage-move-for-a-project)
+   for the first repository using the API. For example:
+
+   ```shell
+   curl --request POST --header "Private-Token: " --header "Content-Type: application/json" \
+   --data '{"destination_storage_name":"praefect"}' "https://gitlab.example.com/api/v4/projects/123/repository_storage_moves"
+   ```
+
+1. Using the ID that is returned, [query the repository move](../../api/project_repository_storage_moves.md#get-a-single-repository-storage-move-for-a-project)
+   using the API. The query indicates either:
+   - The move has completed successfully. The `state` field is `finished`.
+   - The move is in progress. Re-query the repository move until it completes successfully.
+   - The move has failed. Most failures are temporary and are solved by rescheduling the move.
+
+1. Once the move is successful, repeat these steps for all repositories for your projects.
 
 ## Debugging Praefect
 
diff --git a/doc/api/groups.md b/doc/api/groups.md
index 07b2738f2d3..21b46457123 100644
--- a/doc/api/groups.md
+++ b/doc/api/groups.md
@@ -1207,3 +1207,26 @@ the `commit_committer_check` and `reject_unsigned_commits` parameters:
   ...
 }
 ```
+
+### Add group push rule **(STARTER)**
+
+Adds [push rules](../user/group/index.md#group-push-rules-starter) to the specified group.
+
+```plaintext
+POST /groups/:id/push_rule
+```
+
+| Attribute                                     | Type           | Required | Description |
+| --------------------------------------------- | -------------- | -------- | ----------- |
+| `id`                                          | integer/string | yes      | The ID or [URL-encoded path of the group](README.md#namespaced-path-encoding) |
+| `deny_delete_tag` **(STARTER)**               | boolean        | no       | Deny deleting a tag |
+| `member_check` **(STARTER)**                  | boolean        | no       | Allows only GitLab users to author commits |
+| `prevent_secrets` **(STARTER)**               | boolean        | no       | [Files that are likely to contain secrets](https://gitlab.com/gitlab-org/gitlab/-/blob/master/ee/lib/gitlab/checks/files_denylist.yml) will be rejected |
+| `commit_message_regex` **(STARTER)**          | string         | no       | All commit messages must match the regular expression provided in this attribute, e.g. `Fixed \d+\..*` |
+| `commit_message_negative_regex` **(STARTER)** | string         | no       | Commit messages matching the regular expression provided in this attribute will not be allowed, e.g. `ssh\:\/\/` |
+| `branch_name_regex` **(STARTER)**             | string         | no       | All branch names must match the regular expression provided in this attribute, e.g. `(feature|hotfix)\/*` |
+| `author_email_regex` **(STARTER)**            | string         | no       | All commit author emails must match the regular expression provided in this attribute, e.g. `@my-company.com$` |
+| `file_name_regex` **(STARTER)**               | string         | no       | Filenames matching the regular expression provided in this attribute will **not** be allowed, e.g. `(jar|exe)$` |
+| `max_file_size` **(STARTER)**                 | integer        | no       | Maximum file size (MB) allowed |
+| `commit_committer_check` **(PREMIUM)**        | boolean        | no       | Only commits pushed using verified emails will be allowed |
+| `reject_unsigned_commits` **(PREMIUM)**       | boolean        | no       | Only commits signed through GPG will be allowed |
diff --git a/doc/api/project_repository_storage_moves.md b/doc/api/project_repository_storage_moves.md
index f7fb361bf53..2010fccc624 100644
--- a/doc/api/project_repository_storage_moves.md
+++ b/doc/api/project_repository_storage_moves.md
@@ -9,8 +9,22 @@ type: reference
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/31285) in GitLab 13.0.
 
-Project repository storage can be moved. To retrieve project repository storage moves using the API,
-you must [authenticate yourself](README.md#authentication) as an administrator.
+Project repositories can be moved between storages. This can be useful when
+[migrating to Gitaly Cluster](../administration/gitaly/praefect.md#migrate-existing-repositories-to-gitaly-cluster),
+for example.
+
+As project repository storage moves are processed, they transition through different states. Values
+of `state` are:
+
+- `initial`
+- `scheduled`
+- `started`
+- `finished`
+- `failed`
+- `replicated`
+- `cleanup_failed`
+
+This API requires you to [authenticate yourself](README.md#authentication) as an administrator.
 
 ## Retrieve all project repository storage moves
 
diff --git a/doc/development/documentation/styleguide.md b/doc/development/documentation/styleguide.md
index d37c00ef69b..0680256d222 100644
--- a/doc/development/documentation/styleguide.md
+++ b/doc/development/documentation/styleguide.md
@@ -1,69 +1,98 @@
 ---
+stage: none
+group: Style Guide
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#designated-technical-writers
 description: 'Writing styles, markup, formatting, and other standards for GitLab Documentation.'
 ---
 
 # Documentation Style Guide
 
-This document defines the standards for GitLab's documentation content and files.
+This document defines the standards for GitLab's documentation content and
+files.
 
 For broader information about the documentation, see the [Documentation guidelines](index.md).
 
 For programmatic help adhering to the guidelines, see [Testing](index.md#testing).
 
-See the GitLab handbook for further [writing style guidelines](https://about.gitlab.com/handbook/communication/#writing-style-guidelines)
+See the GitLab Handbook for additional [writing style guidelines](https://about.gitlab.com/handbook/communication/#writing-style-guidelines)
 that apply to all GitLab content, not just documentation.
 
-View [a list of recent style guide updates](https://gitlab.com/dashboard/merge_requests?scope=all&utf8=%E2%9C%93&state=merged&label_name[]=tw-style¬[label_name][]=docs%3A%3Afix).
+View a list of [recent style guide updates](https://gitlab.com/dashboard/merge_requests?scope=all&utf8=%E2%9C%93&state=merged&label_name[]=tw-style¬[label_name][]=docs%3A%3Afix).
 
 ## Documentation is the single source of truth (SSOT)
 
 ### Why a single source of truth
 
-The documentation of GitLab products and features is the SSOT for all information related to implementation, usage, and troubleshooting. It evolves continuously, in keeping with new products and features, and with improvements for clarity, accuracy, and completeness.
+The documentation of GitLab products and features is the SSOT for all
+information related to implementation, usage, and troubleshooting. It evolves
+continuously, in keeping with new products and features, and with improvements
+for clarity, accuracy, and completeness.
 
-This policy prevents information silos, making it easier to find information about GitLab products.
+This policy prevents information silos, making it easier to find information
+about GitLab products.
 
-It also informs decisions about the kinds of content we include in our documentation.
+It also informs decisions about the kinds of content we include in our
+documentation.
 
 ### All information
 
-Include problem-solving actions that may address rare cases or be considered 'risky', so long as proper context is provided in the form of fully detailed warnings and caveats. This kind of content should be included as it could be helpful to others and, when properly explained, its benefits outweigh the risks. If you think you have found an exception to this rule, contact the Technical Writing team.
+Include problem-solving actions that may address rare cases or be considered
+*risky*, so long as proper context is provided in the form of fully detailed
+warnings and caveats. This kind of content should be included as it could be
+helpful to others and, when properly explained, its benefits outweigh the risks.
+If you think you have found an exception to this rule, contact the
+Technical Writing team.
 
-We will add all troubleshooting information to the documentation, no matter how unlikely a user is to encounter a situation.
-For the [Troubleshooting sections](#troubleshooting), people in GitLab Support can merge additions themselves.
+We will add all troubleshooting information to the documentation, no matter how
+unlikely a user is to encounter a situation. For the [Troubleshooting sections](#troubleshooting),
+people in GitLab Support can merge additions themselves.
 
 ### All media types
 
-Include any media types/sources if the content is relevant to readers. You can freely include or link presentations, diagrams, videos, and so on; no matter who it was originally composed for, if it is helpful to any of our audiences, we can include it.
+Include any media types/sources if the content is relevant to readers. You can
+freely include or link presentations, diagrams, videos, and so on; no matter who
+it was originally composed for, if it is helpful to any of our audiences, we can
+include it.
 
-- If you use an image that has a separate source file (for example, a vector or diagram format), link the image to the source file so that it may be reused or updated by anyone.
-- Do not copy and paste content from other sources unless it is a limited quotation with the source cited. Typically it is better to either rephrase relevant information in your own words or link out to the other source.
+- If you use an image that has a separate source file (for example, a vector or
+  diagram format), link the image to the source file so that it may be reused or
+  updated by anyone.
+- Do not copy and paste content from other sources unless it is a limited
+  quotation with the source cited. Typically it is better to either rephrase
+  relevant information in your own words or link out to the other source.
 
 ### No special types
 
-In the software industry, it is a best practice to organize documentation in different types. For example, [Divio recommends](https://www.divio.com/blog/documentation/):
+In the software industry, it is a best practice to organize documentation in
+different types. For example, [Divio recommends](https://www.divio.com/blog/documentation/):
 
-1. Tutorials
-1. How-to guides
-1. Explanation
-1. Reference (for example, a glossary)
+- Tutorials
+- How-to guides
+- Explanation
+- Reference (for example, a glossary)
 
-At GitLab, we have so many product changes in our monthly releases that we can't afford to continuously update multiple types of information.
-If we have multiple types, the information will become outdated. Therefore, we have a [single template](structure.md) for documentation.
+At GitLab, we have so many product changes in our monthly releases that we can't
+afford to continuously update multiple types of information. If we have multiple
+types, the information will become outdated. Therefore, we have a
+[single template](structure.md) for documentation.
 
-We currently do not distinguish specific document types, although we are open to reconsidering this policy
-once the documentation has reached a future stage of maturity and quality. If you are reading this, then despite our
-continuous improvement efforts, that point hasn't been reached.
+We currently do not distinguish specific document types, although we are open to
+reconsidering this policy after the documentation has reached a future stage of
+maturity and quality. If you are reading this, then despite our continuous
+improvement efforts, that point hasn't been reached.
 
 ### Link instead of summarize
 
-There is a temptation to summarize the information on another page.
-This will cause the information to live in two places.
-Instead, link to the SSOT and explain why it is important to consume the information.
+There is a temptation to summarize the information on another page. This will
+cause the information to live in two places. Instead, link to the single source
+of truth and explain why it is important to consume the information.
 
 ### Organize by topic, not by type
 
-Beyond top-level audience-type folders (for example, `administration`), we organize content by topic, not by type, so it can be located as easily as possible within the single-source-of-truth (SSOT) section for the subject matter.
+Beyond top-level audience-type folders (for example, `administration`), we
+organize content by topic, not by type, so it can be located as easily as
+possible within the single-source-of-truth (SSOT) section for the subject
+matter.
 
 For example, do not create groupings of similar media types. For example:
 
@@ -71,46 +100,69 @@ For example, do not create groupings of similar media types. For example:
 - FAQs.
 - Sets of all articles or videos.
 
-Such grouping of content by type makes
-it difficult to browse for the information you need and difficult to maintain up-to-date content.
-Instead, organize content by its subject (for example, everything related to CI goes together)
-and cross-link between any related content.
+Such grouping of content by type makes it difficult to browse for the information
+you need and difficult to maintain up-to-date content. Instead, organize content
+by its subject (for example, everything related to CI goes together) and
+cross-link between any related content.
 
 ### Docs-first methodology
 
-We employ a **docs-first methodology** to help ensure the docs remain a complete and trusted resource, and to make communicating about the use of GitLab more efficient.
+We employ a *documentation-first methodology* to help ensure the documentation
+remains a complete and trusted resource, and to make communicating about the use
+of GitLab more efficient.
 
-- If the answer to a question exists in documentation, share the link to the docs instead of rephrasing the information.
-- When you encounter new information not available in GitLab’s documentation (for example, when working on a support case or testing a feature), your first step should be to create a merge request (MR) to add this information to the docs. You can then share the MR in order to communicate this information.
+- If the answer to a question exists in documentation, share the link to the
+  documentation instead of rephrasing the information.
+- When you encounter new information not available in GitLab’s documentation (for
+  example, when working on a support case or testing a feature), your first step
+  should be to create a merge request (MR) to add this information to the
+  documentation. You can then share the MR in order to communicate this
+  information.
 
-New information that would be useful toward the future usage or troubleshooting of GitLab should not be written directly in a forum or other messaging system, but added to a docs MR and then referenced, as described above. Note that among any other doc changes, you can either:
+New information that would be useful toward the future usage or troubleshooting
+of GitLab should not be written directly in a forum or other messaging system,
+but added to a documentation MR and then referenced, as described above. Note
+that among any other documentation changes, you can either:
 
 - Add a [Troubleshooting section](#troubleshooting) to a doc if none exists.
-- Un-comment and use the placeholder Troubleshooting section included as part of our [doc template](structure.md#template-for-new-docs), if present.
+- Un-comment and use the placeholder Troubleshooting section included as part of
+  our [documentation template](structure.md#template-for-new-docs), if present.
 
-The more we reflexively add useful information to the docs, the more (and more successfully) the docs will be used to efficiently accomplish tasks and solve problems.
+The more we reflexively add useful information to the documentation, the more
+(and more successfully) the documentation will be used to efficiently accomplish
+tasks and solve problems.
 
-If you have questions when considering, authoring, or editing docs, ask the Technical Writing team on Slack in `#docs` or in GitLab by mentioning the writer for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/product-categories/#devops-stages). Otherwise, forge ahead with your best effort. It does not need to be perfect; the team is happy to review and improve upon your content. Please review the [Documentation guidelines](index.md) before you begin your first documentation MR.
+If you have questions when considering, authoring, or editing documentation, ask
+the Technical Writing team on Slack in `#docs` or in GitLab by mentioning the
+writer for the applicable [DevOps stage](https://about.gitlab.com/handbook/product/product-categories/#devops-stages).
+Otherwise, forge ahead with your best effort. It does not need to be perfect;
+the team is happy to review and improve upon your content. Please review the
+[Documentation guidelines](index.md) before you begin your first documentation MR.
 
-Having a knowledge base in any form that is separate from the documentation would be against the docs-first methodology because the content would overlap with the documentation.
+Having a knowledge base in any form that is separate from the documentation would
+be against the documentation-first methodology because the content would overlap with
+the documentation.
 
 ## Markdown
 
 All GitLab documentation is written using [Markdown](https://en.wikipedia.org/wiki/Markdown).
 
-The [documentation website](https://docs.gitlab.com) uses GitLab Kramdown as its Markdown rendering engine. For a complete Kramdown reference, see the [GitLab Markdown Kramdown Guide](https://about.gitlab.com/handbook/markdown-guide/).
+The [documentation website](https://docs.gitlab.com) uses GitLab Kramdown as its
+Markdown rendering engine. For a complete Kramdown reference, see the
+[GitLab Markdown Kramdown Guide](https://about.gitlab.com/handbook/markdown-guide/).
 
-The [`gitlab-kramdown`](https://gitlab.com/gitlab-org/gitlab_kramdown)
-Ruby gem will support all [GFM markup](../../user/markdown.md) in the future. That is,
-all markup supported for display in the GitLab application itself. For now,
-use regular Markdown markup, following the rules in the linked style guide.
+The [`gitlab-kramdown`](https://gitlab.com/gitlab-org/gitlab_kramdown) Ruby gem
+will support all [GFM markup](../../user/markdown.md) in the future. That is,
+all markup supported for display in the GitLab application itself. For now, use
+regular Markdown markup, following the rules in the linked style guide.
 
-Note that Kramdown-specific markup (for example, `{:.class}`) will not render properly on GitLab instances under [`/help`](index.md#gitlab-help).
+Note that Kramdown-specific markup (for example, `{:.class}`) will not render
+properly on GitLab instances under [`/help`](index.md#gitlab-help).
 
 ### HTML in Markdown
 
-Hard-coded HTML is valid, although it's discouraged from being used while we have `/help`.
-HTML is permitted as long as:
+Hard-coded HTML is valid, although it's discouraged from being used while we
+have `/help`. HTML is permitted as long as:
 
 - There's no equivalent markup in Markdown.
 - Advanced tables are necessary.
@@ -120,23 +172,23 @@ HTML is permitted as long as:
 ### Markdown Rules
 
 GitLab ensures that the Markdown used across all documentation is consistent, as
-well as easy to review and maintain, by [testing documentation changes](index.md#testing) with
-[markdownlint](index.md#markdownlint). This lint test fails when any document has an issue
-with Markdown formatting that may cause the page to render incorrectly within GitLab.
-It will also fail when a document is using non-standard Markdown (which may render
-correctly, but is not the current standard for GitLab documentation).
+well as easy to review and maintain, by [testing documentation changes](index.md#testing)
+with [markdownlint](index.md#markdownlint). This lint test fails when any
+document has an issue with Markdown formatting that may cause the page to render
+incorrectly within GitLab. It will also fail when a document is using
+non-standard Markdown (which may render correctly, but is not the current
+standard for GitLab documentation).
 
 #### Markdown rule `MD044/proper-names` (capitalization)
 
-A rule that could cause confusion is `MD044/proper-names`, as it might not be immediately
-clear what caused markdownlint to fail, or how to correct the failure. This rule
-checks a list of known words, listed in the `.markdownlint.json` file in each project,
-to verify proper use of capitalization and backticks. Words in backticks will
-be ignored by markdownlint.
+A rule that could cause confusion is `MD044/proper-names`, as it might not be
+immediately clear what caused markdownlint to fail, or how to correct the
+failure. This rule checks a list of known words, listed in the `.markdownlint.json`
+file in each project, to verify proper use of capitalization and backticks.
+Words in backticks will be ignored by markdownlint.
 
-In general, product names should follow the exact capitalization of the official names
-of the products, protocols, and so on.
-See [`.markdownlint.json`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.markdownlint.json)
+In general, product names should follow the exact capitalization of the official
+names of the products, protocols, and so on. See [`.markdownlint.json`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.markdownlint.json)
 for the words tested for proper capitalization in GitLab documentation.
 
 Some examples fail if incorrect capitalization is used:
@@ -145,60 +197,66 @@ Some examples fail if incorrect capitalization is used:
 - NGINX (needs all capitals)
 - runit (needs lowercase `r`)
 
-Additionally, commands, parameters, values, filenames, and so on must be included in backticks.
-For example:
+Additionally, commands, parameters, values, filenames, and so on must be
+included in backticks. For example:
 
 - "Change the `needs` keyword in your `.gitlab.yml`..."
-  - `needs` is a parameter, and `.gitlab.yml` is a file, so both need backticks. Additionally,
-    `.gitlab.yml` will fail markdownlint without backticks as it does not have capital G or L.
+  - `needs` is a parameter, and `.gitlab.yml` is a file, so both need backticks.
+    Additionally, `.gitlab.yml` will fail markdownlint without backticks as it
+    does not have capital G or L.
 - "Run `git clone` to clone a Git repository..."
-  - `git clone` is a command, so it must be lowercase, while Git is the product, so
-    it must have a capital G.
+  - `git clone` is a command, so it must be lowercase, while Git is the product,
+    so it must have a capital G.
 
 ## Structure
 
-Because we want documentation to be a SSOT, we should [organize by topic, not by type](#organize-by-topic-not-by-type).
+Because we want documentation to be a SSOT, we should [organize by topic, not by
+type](#organize-by-topic-not-by-type).
 
 ### Folder structure overview
 
 The documentation is separated by top-level audience folders [`user`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/doc/user),
-[`administration`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/doc/administration), and [`development`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/doc/development) (contributing) folders.
+[`administration`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/doc/administration),
+and [`development`](https://gitlab.com/gitlab-org/gitlab-foss/tree/master/doc/development)
+(contributing) folders.
 
-Beyond that, we primarily follow the structure of the GitLab user interface or API.
+Beyond that, we primarily follow the structure of the GitLab user interface or
+API.
 
-Our goal is to have a clear hierarchical structure with meaningful URLs
-like `docs.gitlab.com/user/project/merge_requests/`. With this pattern,
-you can immediately tell that you are navigating to user-related documentation
-about Project features; specifically about Merge Requests. Our site's paths match
+Our goal is to have a clear hierarchical structure with meaningful URLs like
+`docs.gitlab.com/user/project/merge_requests/`. With this pattern, you can
+immediately tell that you are navigating to user-related documentation about
+Project features; specifically about Merge Requests. Our site's paths match
 those of our repository, so the clear structure also makes documentation easier to update.
 
 The table below shows what kind of documentation goes where.
 
-| Directory             | What belongs here      |
-|:----------------------|:---------------------------------------------------------------------------------------------------------------------------------|
-| `doc/user/`           | User related documentation. Anything that can be done within the GitLab UI goes here, including usage of the `/admin` interface. |
+| Directory             | What belongs here                                                                                                                       |
+|:----------------------|:----------------------------------------------------------------------------------------------------------------------------------------|
+| `doc/user/`           | User related documentation. Anything that can be done within the GitLab user interface goes here, including usage of the `/admin` interface.        |
 | `doc/administration/` | Documentation that requires the user to have access to the server where GitLab is installed. The admin settings that can be accessed via GitLab's interface exist under `doc/user/admin_area/`. |
-| `doc/api/`            | API related documentation. |
-| `doc/development/`    | Documentation related to the development of GitLab, whether contributing code or docs. Related process and style guides should go here. |
-| `doc/legal/`          | Legal documents about contributing to GitLab. |
-| `doc/install/`        | Contains instructions for installing GitLab. |
-| `doc/update/`         | Contains instructions for updating GitLab. |
-| `doc/topics/`         | Indexes per topic (`doc/topics/topic-name/index.md`): all resources for that topic. |
+| `doc/api/`            | API related documentation.                                                                                                              |
+| `doc/development/`    | Documentation related to the development of GitLab, whether contributing code or documentation. Related process and style guides should go here. |
+| `doc/legal/`          | Legal documents about contributing to GitLab.                                                                                           |
+| `doc/install/`        | Contains instructions for installing GitLab.                                                                                            |
+| `doc/update/`         | Contains instructions for updating GitLab.                                                                                              |
+| `doc/topics/`         | Indexes per topic (`doc/topics/topic-name/index.md`): all resources for that topic.                                                     |
 
 ### Work with directories and files
 
 1. When you create a new directory, always start with an `index.md` file.
-   Do not use another file name and **do not** create `README.md` files.
-1. **Do not** use special characters and spaces, or capital letters in file names,
-   directory names, branch names, and anything that generates a path.
-1. When creating or renaming a file or directory and it has more than one word in its name,
-   use underscores (`_`) instead of spaces or dashes. For example,
-   proper naming would be `import_project/import_from_github.md`. This applies to
-   image files as well as Markdown files.
+   Do not use another file name and *do not* create `README.md` files.
+1. *Do not* use special characters and spaces, or capital letters in file
+   names, directory names, branch names, and anything that generates a path.
+1. When creating or renaming a file or directory and it has more than one word
+   in its name, use underscores (`_`) instead of spaces or dashes. For example,
+   proper naming would be `import_project/import_from_github.md`. This applies
+   to both image files and Markdown files.
 1. For image files, do not exceed 100KB.
 1. Do not upload video files to the product repositories.
    [Link or embed videos](#videos) instead.
-1. There are four main directories, `user`, `administration`, `api` and `development`.
+1. There are four main directories: `user`, `administration`, `api`, and
+   `development`.
 1. The `doc/user/` directory has five main subdirectories: `project/`, `group/`,
    `profile/`, `dashboard/` and `admin_area/`.
    1. `doc/user/project/` should contain all project related documentation.
@@ -218,32 +276,41 @@ The table below shows what kind of documentation goes where.
 1. The `doc/topics/` directory holds topic-related technical content. Create
    `doc/topics/topic_name/subtopic_name/index.md` when subtopics become necessary.
    General user- and admin- related documentation, should be placed accordingly.
-1. The directories `/workflow/`, `/university/`, and `/articles/` have
-   been **deprecated** and the majority their docs have been moved to their correct location
-   in small iterations.
+1. The directories `/workflow/`, `/university/`, and `/articles/` have been
+   *deprecated* and the majority their documentation has been moved to their
+   correct location in small iterations.
 
-If you are unsure where a document or a content addition should live, this should
+If you are unsure where to place a document or a content addition, this should
 not stop you from authoring and contributing. You can use your best judgment and
-then ask the reviewer of your MR to confirm your decision, and/or ask a technical writer
-at any stage in the process. The technical writing team will review all documentation
-changes, regardless, and can move content if there is a better place for it.
+then ask the reviewer of your MR to confirm your decision, and/or ask a
+technical writer at any stage in the process. The technical writing team will
+review all documentation changes, regardless, and can move content if there is a
+better place for it.
 
 ### Avoid duplication
 
-Do not include the same information in multiple places. [Link to a SSOT instead.](#link-instead-of-summarize)
+Do not include the same information in multiple places.
+[Link to a single source of truth instead.](#link-instead-of-summarize)
 
 ### References across documents
 
-- Give each folder an index.md page that introduces the topic, introduces the pages within, and links to the pages within (including to the index pages of any next-level subpaths).
-- To ensure discoverability, ensure each new or renamed doc is linked from its higher-level index page and other related pages.
-- When making reference to other GitLab products and features, link to their respective docs, at least on first mention.
-- When making reference to third-party products or technologies, link out to their external sites, documentation, and resources.
+- Give each folder an index.md page that introduces the topic, introduces the
+  pages within, and links to the pages within (including to the index pages of
+  any next-level subpaths).
+- To ensure discoverability, ensure each new or renamed doc is linked from its
+  higher-level index page and other related pages.
+- When making reference to other GitLab products and features, link to their
+  respective documentation, at least on first mention.
+- When making reference to third-party products or technologies, link out to
+  their external sites, documentation, and resources.
 
 ### Structure within documents
 
-- Include any and all applicable subsections as described on the [structure and template](structure.md) page.
-- Structure content in alphabetical order in tables, lists, and so on, unless there is
-  a logical reason not to (for example, when mirroring the UI or an otherwise ordered sequence).
+- Include any and all applicable subsections as described on the
+  [structure and template](structure.md) page.
+- Structure content in alphabetical order in tables, lists, and so on, unless
+  there's a logical reason not to (for example, when mirroring the user
+  interface or an otherwise ordered sequence).
 
 ## Language
 
@@ -255,9 +322,9 @@ GitLab documentation should be clear and easy to understand.
 
 ### Point of view
 
-In most cases, it’s appropriate to use the second-person (you, yours) point of view,
-because it’s friendly and easy to understand.
-(Tested in [`FirstPerson.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/FirstPerson.yml).)
+In most cases, it’s appropriate to use the second-person (you, yours) point of
+view, because it’s friendly and easy to understand. (Tested in
+[`FirstPerson.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/FirstPerson.yml).)
 
 
 
@@ -272,16 +339,18 @@ Use sentence case. For example:
 
 #### UI text
 
-When referring to specific user interface text, like a button label or menu item, use the same capitalization that is displayed in the UI.
-Standards for this content are listed in the [Pajamas Design System Content section](https://design.gitlab.com/content/punctuation/) and typically
-match what is called for in this Documentation Style Guide.
+When referring to specific user interface text, like a button label or menu
+item, use the same capitalization that is displayed in the user interface.
+Standards for this content are listed in the [Pajamas Design System Content section](https://design.gitlab.com/content/punctuation/)
+and typically match what is called for in this Documentation Style Guide.
 
-If you think there is a mistake in the way the UI text is styled,
-create an issue or an MR to propose a change to the UI text.
+If you think there is a mistake in the way the user interface text is styled,
+create an issue or an MR to propose a change to the user interface text.
 
 #### Feature names
 
-- **Feature names are typically lowercase**, like those describing actions and types of objects in GitLab. For example:
+- *Feature names are typically lowercase*, like those describing actions and
+  types of objects in GitLab. For example:
   - epics
   - issues
   - issue weights
@@ -289,7 +358,8 @@ create an issue or an MR to propose a change to the UI text.
   - milestones
   - reorder issues
   - runner, runners, shared runners
-- **Some features are capitalized**, typically nouns naming GitLab-specific capabilities or tools. For example:
+- *Some features are capitalized*, typically nouns naming GitLab-specific
+  capabilities or tools. For example:
   - GitLab CI/CD
   - Repository Mirroring
   - Value Stream Analytics
@@ -298,20 +368,27 @@ create an issue or an MR to propose a change to the UI text.
   - Geo
   - GitLab Runner (see [this issue](https://gitlab.com/gitlab-org/gitlab/-/issues/233529) for details)
 
-Document any exceptions in this style guide. If you're not sure, ask a GitLab Technical Writer so that they can help decide and document the result.
+Document any exceptions in this style guide. If you're not sure, ask a GitLab
+Technical Writer so that they can help decide and document the result.
 
-Do not match the capitalization of terms or phrases on the [Features page](https://about.gitlab.com/features/) or [features.yml](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/features.yml) by default.
+Do not match the capitalization of terms or phrases on the [Features page](https://about.gitlab.com/features/)
+or [features.yml](https://gitlab.com/gitlab-com/www-gitlab-com/blob/master/data/features.yml)
+by default.
 
 #### Other terms
 
 Capitalize names of:
 
-- GitLab [product tiers](https://about.gitlab.com/pricing/). For example, GitLab Core
-  and GitLab Ultimate. (Tested in [`BadgeCapitalization.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/BadgeCapitalization.yml).)
-- Third-party organizations, software, and products. For example, Prometheus, Kubernetes, Git, and The Linux Foundation.
-- Methods or methodologies. For example, Continuous Integration, Continuous Deployment, Scrum, and Agile. (Tested in [`.markdownlint.json`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.markdownlint.json).)
+- GitLab [product tiers](https://about.gitlab.com/pricing/). For example,
+  GitLab Core and GitLab Ultimate. (Tested in [`BadgeCapitalization.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/BadgeCapitalization.yml).)
+- Third-party organizations, software, and products. For example, Prometheus,
+  Kubernetes, Git, and The Linux Foundation.
+- Methods or methodologies. For example, Continuous Integration,
+  Continuous Deployment, Scrum, and Agile. (Tested in [`.markdownlint.json`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.markdownlint.json).)
 
-Follow the capitalization style listed at the [authoritative source](#links-to-external-documentation) for the entity, which may use non-standard case styles. For example: GitLab and npm.
+Follow the capitalization style listed at the [authoritative source](#links-to-external-documentation)
+for the entity, which may use non-standard case styles. For example: GitLab and
+npm.
 
 Use forms of *sign in*, instead of *log in* or *login*. For example:
 
@@ -325,31 +402,33 @@ references to user interface elements. For example:
 
 ### Inclusive language
 
-We strive to create documentation that is inclusive. This section includes guidance and examples in the
-following categories:
+We strive to create documentation that is inclusive. This section includes
+guidance and examples in the following categories:
 
 - [Gender-specific wording](#avoid-gender-specific-wording).
 - [Ableist language](#avoid-ableist-language).
 - [Cultural sensitivity](#culturally-sensitive-language).
 
-We write our developer documentation with inclusivity and diversity in mind. This page is not an exhaustive reference, but describes some general guidelines and examples that illustrate some best practices to follow.
+We write our developer documentation with inclusivity and diversity in mind. This
+page is not an exhaustive reference, but describes some general guidelines and
+examples that illustrate some best practices to follow.
 
 #### Avoid gender-specific wording
 
 When possible, use gender-neutral pronouns. For example, you can use a singular
-[they](https://developers.google.com/style/pronouns#gender-neutral-pronouns) as a gender-neutral
-pronoun.
+[they](https://developers.google.com/style/pronouns#gender-neutral-pronouns) as
+a gender-neutral pronoun.
 
 Avoid the use of gender-specific pronouns, unless referring to a specific person.
 
-| Use                               | Avoid           |
-|-----------------------------------|-----------------|
-| People, humanity                  | Mankind         |
-| GitLab Team Members               | Manpower        |
+| Use                               | Avoid                           |
+|-----------------------------------|---------------------------------|
+| People, humanity                  | Mankind                         |
+| GitLab Team Members               | Manpower                        |
 | You can install; They can install | He can install; She can install |
 
-If you need to set up [Fake user information](#fake-user-information), use diverse or non-gendered
-names with common surnames.
+If you need to set up [Fake user information](#fake-user-information), use
+diverse or non-gendered names with common surnames.
 
 #### Avoid ableist language
 
@@ -364,11 +443,14 @@ Avoid terms that are also used in negative stereotypes for different groups.
 | Active/Inactive        | Enabled/Disabled     |
 | On/Off                 | Enabled/Disabled     |
 
-Credit: [Avoid ableist language](https://developers.google.com/style/inclusive-documentation#ableist-language) in the Google Developer Style Guide.
+Credit: [Avoid ableist language](https://developers.google.com/style/inclusive-documentation#ableist-language)
+in the Google Developer Style Guide.
 
 #### Culturally sensitive language
 
-Avoid terms that reflect negative cultural stereotypes and history. In most cases, you can replace terms such as `master` and `slave` with terms that are more precise and functional, such as `primary` and `secondary`.
+Avoid terms that reflect negative cultural stereotypes and history. In most
+cases, you can replace terms such as `master` and `slave` with terms that are
+more precise and functional, such as `primary` and `secondary`.
 
 | Use                  | Avoid                 |
 |----------------------|-----------------------|
@@ -382,8 +464,10 @@ For more information see the following [Internet Draft specification](https://to
 When creating documentation, limit or avoid the use of the following verb
 tenses, words, and phrases:
 
-- Avoid jargon when possible, and when not possible, define the term or [link to a definition](#links-to-external-documentation).
-- Avoid uncommon words when a more-common alternative is possible, ensuring that content is accessible to more readers.
+- Avoid jargon when possible, and when not possible, define the term or
+ [link to a definition](#links-to-external-documentation).
+- Avoid uncommon words when a more-common alternative is possible, ensuring that
+  content is accessible to more readers.
 - Don't write in the first person singular.
   (Tested in [`FirstPerson.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/FirstPerson.yml).)
   - Instead of "I" or "me," use "we," "you," "us," or "one."
@@ -445,7 +529,10 @@ tenses, words, and phrases:
 
 ### Contractions
 
-- Use common contractions when it helps create a friendly and informal tone, especially in tutorials, instructional documentation, and [UIs](https://design.gitlab.com/content/punctuation/#contractions). (Tested in [`Contractions.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/Contractions.yml).)
+- Use common contractions when it helps create a friendly and informal tone,
+  especially in tutorials, instructional documentation, and
+  [user interfaces](https://design.gitlab.com/content/punctuation/#contractions).
+  (Tested in [`Contractions.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/Contractions.yml).)
 
   | Do       | Don't     |
   |----------|-----------|
@@ -479,19 +566,19 @@ tenses, words, and phrases:
 
   | Do                          | Don't                      |
   |-----------------------------|----------------------------|
-  | Do **not** install X with Y | **Don't** install X with Y |
+  | Do *not* install X with Y   | *Don't* install X with Y   |
 
 - Do not use contractions in reference documentation. For example:
 
-  | Do                                       | Don't                      |
-  |------------------------------------------|----------------------------|
-  | Do **not** set a limit greater than 1000 | **Don't** set a limit greater than 1000 |
+  | Do                                       | Don't                                  |
+  |------------------------------------------|----------------------------------------|
+  | Do *not* set a limit greater than 1000   | *Don't* set a limit greater than 1000  |
   | For `parameter1`, the default is 10      | For `parameter1`, the default's 10     |
 
 - Avoid contractions in error messages. Examples:
 
-  | Do                                       | Don't                      |
-  |------------------------------------------|----------------------------|
+  | Do                                       | Don't                                |
+  |------------------------------------------|--------------------------------------|
   | Requests to localhost are not allowed    | Requests to localhost aren't allowed |
   | Specified URL cannot be used             | Specified URL can't be used          |
 
@@ -500,9 +587,11 @@ tenses, words, and phrases:
 ## Text
 
 - [Write in Markdown](#markdown).
-- Splitting long lines (preferably up to 100 characters) can make it easier to provide feedback on small chunks of text.
+- Splitting long lines (preferably up to 100 characters) can make it easier to
+  provide feedback on small chunks of text.
 - Insert an empty line for new paragraphs.
-- Insert an empty line between different markups (for example, after every paragraph, header, list, and so on). Example:
+- Insert an empty line between different markups (for example, after every
+  paragraph, header, list, and so on). Example:
 
   ```markdown
   ## Header
@@ -521,27 +610,27 @@ tenses, words, and phrases:
 
 ### Punctuation
 
-Check the general punctuation rules for the GitLab documentation on the table below.
-Check specific punctuation rules for [lists](#lists) below.
+Review the general punctuation rules for the GitLab documentation in the
+following table. Check specific punctuation rules for [lists](#lists) below.
 Additional examples are available in the [Pajamas guide for punctuation](https://design.gitlab.com/content/punctuation/).
 
-| Rule | Example |
-| ---- | ------- |
-| Always end full sentences with a period. | _For a complete overview, read through this document._|
+| Rule                                                             | Example                                                |
+|------------------------------------------------------------------|--------------------------------------------------------|
+| Always end full sentences with a period.                         | _For a complete overview, read through this document._ |
 | Always add a space after a period when beginning a new sentence. | _For a complete overview, check this doc. For other references, check out this guide._ |
 | Do not use double spaces. (Tested in [`SentenceSpacing.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/SentenceSpacing.yml).) | --- |
 | Do not use tabs for indentation. Use spaces instead. You can configure your code editor to output spaces instead of tabs when pressing the tab key. | --- |
 | Use serial commas ("Oxford commas") before the final 'and/or' in a list. (Tested in [`OxfordComma.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/OxfordComma.yml).) | _You can create new issues, merge requests, and milestones._ |
 | Always add a space before and after dashes when using it in a sentence (for replacing a comma, for example). | _You should try this - or not._ |
-| Always use lowercase after a colon. | _Related Issues: a way to create a relationship between issues._ |
+| Always use lowercase after a colon.                              | _Related Issues: a way to create a relationship between issues._ |
 
 ### Placeholder text
 
-Often in examples, a writer will provide a command or configuration that is complete apart from
-a value specific to the reader.
+Often in examples, a writer will provide a command or configuration that is
+complete apart from a value specific to the reader.
 
-In these cases, use [`<` and `>`](https://en.wikipedia.org/wiki/Usage_message#Pattern) to call out
-where a reader must replace text with their own value.
+In these cases, use [`<` and `>`](https://en.wikipedia.org/wiki/Usage_message#Pattern)
+to call out where a reader must replace text with their own value.
 
 For example:
 
@@ -551,8 +640,8 @@ cp  
 
 ## Lists
 
-- Always start list items with a capital letter, unless they are parameters or commands
-  that are in backticks, or similar.
+- Always start list items with a capital letter, unless they are parameters or
+  commands that are in backticks, or similar.
 - Always leave a blank line before and after a list.
 - Begin a line with spaces (not tabs) to denote a [nested sub-item](#nesting-inside-a-list-item).
 
@@ -583,19 +672,19 @@ This is a list of available features:
 ### Markup
 
 - Use dashes (`-`) for unordered lists instead of asterisks (`*`).
-- Prefix `1.` to every item in an ordered list.
-  When rendered, the list items will appear with sequential numbering automatically.
+- Prefix `1.` to every item in an ordered list. When rendered, the list items
+  will appear with sequential numbering automatically.
 
 ### Punctuation
 
 - Do not add commas (`,`) or semicolons (`;`) to the end of list items.
-- Only add periods to the end of a list item if the item consists of a complete sentence.
-  The [definition of full sentence](https://www2.le.ac.uk/offices/ld/all-resources/writing/grammar/grammar-guides/sentence)
+- Only add periods to the end of a list item if the item consists of a complete
+  sentence. The [definition of full sentence](https://www2.le.ac.uk/offices/ld/all-resources/writing/grammar/grammar-guides/sentence)
   is: _"a complete sentence always contains a verb, expresses a complete idea, and makes sense standing alone"_.
-- Be consistent throughout the list: if the majority of the items do not end in a period,
-  do not end any of the items in a period, even if they consist of a complete sentence.
-  The opposite is also valid: if the majority of the items end with a period, end
-  all with a period.
+- Be consistent throughout the list: if the majority of the items do not end in
+  a period, do not end any of the items in a period, even if they consist of a
+  complete sentence. The opposite is also valid: if the majority of the items
+  end with a period, end all with a period.
 - Separate list items from explanatory text with a colon (`:`). For example:
 
   ```markdown
@@ -633,16 +722,17 @@ Don't (vary use of periods; majority rules):
 
 ### Nesting inside a list item
 
-It is possible to nest items under a list item, so that they render with the same indentation
-as the list item. This can be done with:
+It's possible to nest items under a list item, so that they render with the same
+indentation as the list item. This can be done with:
 
 - [Code blocks](#code-blocks)
 - [Blockquotes](#blockquotes)
 - [Alert boxes](#alert-boxes)
 - [Images](#images)
 
-Items nested in lists should always align with the first character of the list item.
-In unordered lists (using `-`), this means two spaces for each level of indentation:
+Items nested in lists should always align with the first character of the list
+item. In unordered lists (using `-`), this means two spaces for each level of
+indentation:
 
 ````markdown
 - Unordered list item 1
@@ -688,8 +778,9 @@ For ordered lists, use three spaces for each level of indentation:
    ![an image that will nest inside list item 4](image.png)
 ````
 
-You can nest full lists inside other lists using the same rules as above. If you wish
-to mix types, that is also possible, as long as you don't mix items at the same level:
+You can nest full lists inside other lists using the same rules as above. If you
+want to mix types, that is also possible, as long as you don't mix items at the
+same level:
 
 ```markdown
 1. Ordered list item one.
@@ -747,8 +838,10 @@ page), use the following phrases (based on the SVG icons):
 
 Valid for Markdown content only, not for front matter entries:
 
-- Standard quotes: double quotes (`"`). Example: "This is wrapped in double quotes".
-- Quote within a quote: double quotes (`"`) wrap single quotes (`'`). Example: "I am 'quoting' something within a quote".
+- Standard quotes: double quotes (`"`). Example: "This is wrapped in double
+  quotes".
+- Quote within a quote: double quotes (`"`) wrap single quotes (`'`). Example:
+  "I am 'quoting' something within a quote".
 
 For other punctuation rules, please refer to the
 [GitLab UX guide](https://design.gitlab.com/content/punctuation/).
@@ -766,57 +859,61 @@ For other punctuation rules, please refer to the
 - [Avoid using symbols and special characters](https://gitlab.com/gitlab-org/gitlab-docs/-/issues/84)
   in headers. Whenever possible, they should be plain and short text.
 - Avoid adding things that show ephemeral statuses. For example, if a feature is
-  considered beta or experimental, put this information in a note, not in the heading.
+  considered beta or experimental, put this information in a note, not in the
+  heading.
 - When introducing a new document, be careful for the headings to be
   grammatically and syntactically correct. Mention an [assigned technical writer (TW)](https://about.gitlab.com/handbook/product/product-categories/)
   for review.
-  This is to ensure that no document with wrong heading is going
-  live without an audit, thus preventing dead links and redirection issues when
-  corrected.
+  This is to ensure that no document with wrong heading is going live without an
+  audit, thus preventing dead links and redirection issues when corrected.
 - Leave exactly one blank line before and after a heading.
 - Do not use links in headings.
-- Add the corresponding [product badge](#product-badges) according to the tier the feature belongs.
-- Our docs site search engine prioritizes words used in headings and subheadings.
-  Make you subheading titles clear, descriptive, and complete to help users find the
-  right example, as shown in the section on [heading titles](#heading-titles).
+- Add the corresponding [product badge](#product-badges) according to the tier the
+  feature belongs.
+- Our documentation site search engine prioritizes words used in headings and
+  subheadings. Make you subheading titles clear, descriptive, and complete to help
+  users find the right example, as shown in the section on [heading titles](#heading-titles).
 - See [Capitalization](#capitalization) for guidelines on capitalizing headings.
 
 ### Heading titles
 
-Keep heading titles clear and direct. Make every word count. To accommodate search engine optimization (SEO), use the imperative, where possible.
+Keep heading titles clear and direct. Make every word count. To accommodate
+search engine optimization (SEO), use the imperative, where possible.
 
-| Do   | Don't   |
-|:-----|:--------|
-| Configure GDK | Configuring GDK |
+| Do                                    | Don't                                                       |
+|:--------------------------------------|:------------------------------------------------------------|
+| Configure GDK                         | Configuring GDK                                             |
 | GitLab Release and Maintenance Policy | This section covers GitLab's Release and Maintenance Policy |
-| Backport to older releases | Backporting to older releases |
-| GitLab Pages examples | Examples |
+| Backport to older releases            | Backporting to older releases                               |
+| GitLab Pages examples                 | Examples                                                    |
 
 For guidelines on capitalizing headings, see the section on [capitalization](#capitalization).
 
 NOTE: **Note:**
-If you change an existing title, be careful. Any such changes may affect not only [links](#anchor-links)
-within the page, but may also affect links from GitLab itself, as well as external links, to GitLab documentation.
+If you change an existing title, be careful. Any such changes may affect not
+only [links](#anchor-links) within the page, but may also affect links to the
+GitLab documentation from both the GitLab application and external sites.
 
 ### Anchor links
 
 Headings generate anchor links automatically when rendered. `## This is an example`
 generates the anchor `#this-is-an-example`.
 
-Keep in mind that the GitLab UI links to a large number of docs and respective
-anchor links to take the user to the right spot. Therefore, when you change a
-heading, search `doc/*`, `app/views/*`, and `ee/app/views/*` for the old anchor
-to make sure you're not breaking an anchor linked from other docs nor from the
-GitLab UI. If you find the old anchor, make sure to replace it with the new one.
+Keep in mind that the GitLab user interface links to many documentation pages
+and anchor links to take the user to the right spot. Therefore, when you change
+a heading, search `doc/*`, `app/views/*`, and `ee/app/views/*` for the old
+anchor to make sure you're not breaking an anchor linked from other
+documentation nor from the GitLab user interface. If you find the old anchor, be
+sure to replace it with the new one.
 
 Important:
 
-- Avoid crosslinking docs to headings unless you need to link to a specific section
-  of the document. This will avoid breaking anchors in the future in case the heading
-  is changed.
+- Avoid crosslinking documentation to headings unless you need to link to a
+  specific section of the document. This will avoid breaking anchors in the
+  future in case the heading is changed.
 - If possible, avoid changing headings since they're not only linked internally.
-  There are various links to GitLab documentation on the internet, such as tutorials,
-  presentations, StackOverflow posts, and other sources.
+  There are various links to GitLab documentation on the internet, such as
+  tutorials, presentations, StackOverflow posts, and other sources.
 - Do not link to `h1` headings.
 
 Note that, with Kramdown, it is possible to add a custom ID to an HTML element
@@ -825,16 +922,20 @@ do not use this option until further notice.
 
 ## Links
 
-Links are important in GitLab documentation. They allow you to [link instead of summarizing](#link-instead-of-summarize)
-to help preserve an [SSoT](#why-a-single-source-of-truth) within GitLab documentation.
+Links are important in GitLab documentation. They allow you to [link instead of
+summarizing](#link-instead-of-summarize) to help preserve a [single source of truth](#why-a-single-source-of-truth)
+within GitLab documentation.
 
 We include guidance for links in the following categories:
 
 - How to set up [anchor links](#anchor-links) for headings.
 - How to set up [criteria](#basic-link-criteria) for configuring a link.
-- What to set up when [linking to a `help`](../documentation/index.md#linking-to-help) page.
-- How to set up [links to internal documentation](#links-to-internal-documentation) for cross-references.
-- How to set up [links to external documentation](#links-to-external-documentation) for authoritative sources.
+- What to set up when [linking to a `help`](../documentation/index.md#linking-to-help)
+  page.
+- How to set up [links to internal documentation](#links-to-internal-documentation)
+  for cross-references.
+- How to set up [links to external documentation](#links-to-external-documentation)
+  for authoritative sources.
 - When to use [links requiring permissions](#links-requiring-permissions).
 - How to set up a [link to a video](#link-to-video).
 - How to [include links with version text](#text-for-documentation-requiring-version-text).
@@ -843,7 +944,7 @@ We include guidance for links in the following categories:
 ### Basic link criteria
 
 - Use inline link Markdown markup `[Text](https://example.com)`.
-  It's easier to read, review, and maintain. **Do not** use `[Text][identifier]`.
+  It's easier to read, review, and maintain. *Do not* use `[Text][identifier]`.
 
 - Use [meaningful anchor texts](https://www.futurehosting.com/blog/links-should-have-meaningful-anchor-text-heres-why/).
   For example, instead of writing something like `Read more about GitLab Issue Boards [here](LINK)`,
@@ -852,18 +953,23 @@ We include guidance for links in the following categories:
 ### Links to internal documentation
 
 NOTE: **Note:**
-_Internal_ refers to documentation in the same project. When linking to documentation in
-separate projects (for example, linking to Omnibus docs from GitLab docs), you must use absolute
-URLs.
+_Internal_ refers to documentation in the same project. When linking to
+documentation in separate projects (for example, linking to Omnibus documentation
+from GitLab documentation), you must use absolute URLs.
 
-Do not use absolute URLs like `https://docs.gitlab.com/ee/index.html` to crosslink
-to other docs within the same project. Use relative links to the file, like `../index.md`. (These are converted to HTML when the site is rendered.)
+Do not use absolute URLs like `https://docs.gitlab.com/ee/index.html` to
+crosslink to other documentation within the same project. Use relative links to
+the file, like `../index.md`. (These are converted to HTML when the site is
+rendered.)
 
 Relative linking enables crosslinks to work:
 
 - in Review Apps, local previews, and `/help`.
-- when working on the docs locally, so you can verify that they work as early as possible in the process.
-- within the GitLab UI when browsing doc files in their respective repositories. For example, the links displayed at `https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/README.md`.
+- when working on the documentation locally, so you can verify that they work as
+  early as possible in the process.
+- within the GitLab user interace when browsing doc files in their respective
+  repositories. For example, the links displayed at
+  `https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/README.md`.
 
 To link to internal documentation:
 
@@ -879,7 +985,8 @@ To link to internal documentation:
 
   Do: `../../geo/replication/troubleshooting.md`
 
-- Always add the file name `file.md` at the end of the link with the `.md` extension, not `.html`.
+- Always add the file name `file.md` at the end of the link with the `.md`
+  extension, not `.html`.
 
   Don't:
 
@@ -894,28 +1001,32 @@ To link to internal documentation:
   - `../../issues/tags.md#stages`
 
 NOTE: **Note:**
-Using the Markdown extension is necessary for the [`/help`](index.md#gitlab-help) section of GitLab.
+Using the Markdown extension is necessary for the [`/help`](index.md#gitlab-help)
+section of GitLab.
 
 ### Links to external documentation
 
-When describing interactions with external software, it's often helpful to include links to external
-documentation. When possible, make sure that you're linking to an [**authoritative** source](#authoritative-sources).
-For example, if you're describing a feature in Microsoft's Active Directory, include a link to official Microsoft documentation.
+When describing interactions with external software, it's often helpful to
+include links to external documentation. When possible, make sure that you're
+linking to an [**authoritative** source](#authoritative-sources). For example,
+if you're describing a feature in Microsoft's Active Directory, include a link
+to official Microsoft documentation.
 
 ### Authoritative sources
 
-When citing external information, use sources that are written by the people who created
-the item or product in question. These sources are the most likely to
-be accurate and remain up to date.
+When citing external information, use sources that are written by the people who
+created the item or product in question. These sources are the most likely to be
+accurate and remain up to date.
 
 Examples of authoritative sources include:
 
-- Specifications, such as a [Request for Comments](https://www.ietf.org/standards/rfcs/) document
-from the Internet Engineering Task Force.
-- Official documentation for a product. For example, if you're setting up an interface with the
-Google OAuth 2 authorization server, include a link to Google's documentation.
-- Official documentation for a project. For example, if you're citing NodeJS functionality,
-refer directly to [NodeJS documentation](https://nodejs.org/en/docs/).
+- Specifications, such as a [Request for Comments](https://www.ietf.org/standards/rfcs/)
+  document from the Internet Engineering Task Force.
+- Official documentation for a product. For example, if you're setting up an
+  interface with the Google OAuth 2 authorization server, include a link to
+  Google's documentation.
+- Official documentation for a project. For example, if you're citing NodeJS
+  functionality, refer directly to [NodeJS documentation](https://nodejs.org/en/docs/).
 - Books from an authoritative publisher.
 
 Examples of sources to avoid include:
@@ -926,19 +1037,22 @@ Examples of sources to avoid include:
 - Discussions on forums such as Stack Overflow.
 - Documentation from a company that describes another company's product.
 
-While many of these sources to avoid can help you learn skills and or features, they can become
-obsolete quickly. Nobody is obliged to maintain any of these sites. Therefore, we should avoid using them as reference literature.
+While many of these sources to avoid can help you learn skills and or features,
+they can become obsolete quickly. Nobody is obliged to maintain any of these
+sites. Therefore, we should avoid using them as reference literature.
 
 NOTE: **Note:**
-Non-authoritative sources are acceptable only if there is no equivalent authoritative source.
-Even then, focus on non-authoritative sources that are extensively cited or peer-reviewed.
+Non-authoritative sources are acceptable only if there is no equivalent
+authoritative source. Even then, focus on non-authoritative sources that are
+extensively cited or peer-reviewed.
 
 ### Links requiring permissions
 
 Don't link directly to:
 
 - [Confidential issues](../../user/project/issues/confidential_issues.md).
-- Project features that require [special permissions](../../user/permissions.md) to view.
+- Project features that require [special permissions](../../user/permissions.md)
+  to view.
 
 These will fail for:
 
@@ -950,7 +1064,8 @@ Instead:
 - To reduce confusion, mention in the text that the information is either:
   - Contained in a confidential issue.
   - Requires special permission to a project to view.
-- Provide a link in back ticks (`` ` ``) so that those with access to the issue can easily navigate to it.
+- Provide a link in back ticks (`` ` ``) so that those with access to the issue
+  can easily navigate to it.
 
 Example:
 
@@ -960,40 +1075,42 @@ For more information, see the [confidential issue](../../user/project/issues/con
 
 ### Link to specific lines of code
 
-When linking to specific lines within a file, link to a commit instead of to the branch.
-Lines of code change through time, therefore, linking to a line by using the commit link
-ensures the user lands on the line you're referring to. The **Permalink** button, which is
-available when viewing a file within a project, makes it easy to generate a link to the
-most recent commit of the given file.
+When linking to specific lines within a file, link to a commit instead of to the
+branch. Lines of code change through time, therefore, linking to a line by using
+the commit link ensures the user lands on the line you're referring to. The
+**Permalink** button, which is available when viewing a file within a project,
+makes it easy to generate a link to the most recent commit of the given file.
 
-- **Do:** `[link to line 3](https://gitlab.com/gitlab-org/gitlab/-/blob/11f17c56d8b7f0b752562d78a4298a3a95b5ce66/.gitlab/issue_templates/Feature%20proposal.md#L3)`
-- **Don't:** `[link to line 3](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20proposal.md#L3).`
+- *Do:* `[link to line 3](https://gitlab.com/gitlab-org/gitlab/-/blob/11f17c56d8b7f0b752562d78a4298a3a95b5ce66/.gitlab/issue_templates/Feature%20proposal.md#L3)`
+- *Don't:* `[link to line 3](https://gitlab.com/gitlab-org/gitlab/-/blob/master/.gitlab/issue_templates/Feature%20proposal.md#L3).`
 
-If that linked expression is no longer in that line of the file due to further commits, you
-can still search the file for that query. In this case, update the document to ensure it
-links to the most recent version of the file.
+If that linked expression is no longer in that line of the file due to additional
+commits, you can still search the file for that query. In this case, update the
+document to ensure it links to the most recent version of the file.
 
 ## Navigation
 
-To indicate the steps of navigation through the UI:
+To indicate the steps of navigation through the user interface:
 
 - Use the exact word as shown in the UI, including any capital letters as-is.
-- Use bold text for navigation items and the char "greater than" (`>`) as separator
-  (for example, `Navigate to your project's **Settings > CI/CD**` ).
-- If there are any expandable menus, make sure to mention that the user
-  needs to expand the tab to find the settings you're referring to (for example, `Navigate to your project's **Settings > CI/CD** and expand **General pipelines**`).
+- Use bold text for navigation items and the char "greater than" (`>`) as a
+  separator (for example, `Navigate to your project's **Settings > CI/CD**` ).
+- If there are any expandable menus, make sure to mention that the user needs to
+  expand the tab to find the settings you're referring to (for example,
+  `Navigate to your project's **Settings > CI/CD** and expand **General pipelines**`).
 
 ## Images
 
 Images, including screenshots, can help a reader better understand a concept.
 However, they can be hard to maintain, and should be used sparingly.
 
-Before including an image in the documentation, ensure it provides value to the reader.
+Before including an image in the documentation, ensure it provides value to the
+reader.
 
 ### Capture the image
 
-Use images to help the reader understand where they are in a process, or how they need to
-interact with the application.
+Use images to help the reader understand where they are in a process, or how
+they need to interact with the application.
 
 When you take screenshots:
 
@@ -1027,15 +1144,16 @@ When you take screenshots:
 - Images should be used (only when necessary) to _illustrate_ the description
   of a process, not to _replace_ it.
 - Max image size: 100KB (gifs included).
-- See also how to link and embed [videos](#videos) to illustrate the docs.
+- See also how to link and embed [videos](#videos) to illustrate the
+  documentation.
 
 ### Add the image link to content
 
 The Markdown code for including an image in a document is:
 `![Image description which will be the alt tag](img/document_image_title_vX_Y.png)`
 
-The image description is the alt text for the rendered image on the docs site.
-For accessibility and SEO, use [descriptions](https://webaim.org/techniques/alttext/)
+The image description is the alt text for the rendered image on the
+documentation site. For accessibility and SEO, use [descriptions](https://webaim.org/techniques/alttext/)
 that:
 
 - Are accurate, succinct, and unique.
@@ -1046,9 +1164,9 @@ Also, if a heading immediately follows an image, be sure to add three dashes
 
 ### Remove image shadow
 
-All images displayed on the [GitLab Docs site](https://docs.gitlab.com) have a box shadow by default.
-To remove the box shadow, use the image class `.image-noshadow` applied
-directly to an HTML `img` tag:
+All images displayed on the [GitLab documentation site](https://docs.gitlab.com)
+have a box shadow by default. To remove the box shadow, use the image class
+`.image-noshadow` applied directly to an HTML `img` tag:
 
 ```html
 Alt text (required)
@@ -1085,18 +1203,20 @@ request.
 
 ## Videos
 
-Adding GitLab's existing YouTube video tutorials to the documentation is
-highly encouraged, unless the video is outdated. Videos should not
-replace documentation, but complement or illustrate it. If content in a video is
-fundamental to a feature and its key use cases, but this is not adequately covered in the documentation,
-add this detail to the documentation text or create an issue to review the video and do so.
+Adding GitLab's existing YouTube video tutorials to the documentation is highly
+encouraged, unless the video is outdated. Videos should not replace
+documentation, but complement or illustrate it. If content in a video is
+fundamental to a feature and its key use cases, but this is not adequately
+covered in the documentation, add this detail to the documentation text or
+create an issue to review the video and do so.
 
-Do not upload videos to the product repositories. [Link](#link-to-video) or [embed](#embed-videos) them instead.
+Do not upload videos to the product repositories. [Link](#link-to-video) or
+[embed](#embed-videos) them instead.
 
 ### Link to video
 
-To link out to a video, include a YouTube icon so that readers can
-quickly and easily scan the page for videos before reading:
+To link out to a video, include a YouTube icon so that readers can scan the page
+for videos before reading:
 
 ```markdown
 
@@ -1109,26 +1229,24 @@ You can link any up-to-date video that is useful to the GitLab user.
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-docs/-/merge_requests/472) in GitLab 12.1.
 
-The [GitLab Docs site](https://docs.gitlab.com) supports embedded videos.
+The [GitLab documentation site](https://docs.gitlab.com) supports embedded
+videos.
 
-You can only embed videos from
-[GitLab's official YouTube account](https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg).
+You can only embed videos from [GitLab's official YouTube account](https://www.youtube.com/channel/UCnMGQ8QHMAnVIsI3xJrihhg).
 For videos from other sources, [link](#link-to-video) them instead.
 
-In most cases, it is better to [link to video](#link-to-video) instead,
-because an embed takes up a lot of space on the page and can be distracting
-to readers.
+In most cases, it is better to [link to video](#link-to-video) instead, because
+an embed takes up a lot of space on the page and can be distracting to readers.
 
-To embed a video, follow the instructions below and make sure
-you have your MR reviewed and approved by a technical writer.
+To embed a video, follow the instructions below and make sure you have your MR
+reviewed and approved by a technical writer.
 
-1. Copy the code below and paste it into your Markdown file.
-   Leave a blank line above and below it. Do NOT edit the code
-   (don't remove or add any spaces).
-1. On YouTube, visit the video URL you want to display. Copy
-   the regular URL from your browser (`https://www.youtube.com/watch?v=VIDEO-ID`)
-   and replace the video title and link in the line under `
`.
-1. On YouTube, click **Share**, then **Embed**.
+1. Copy the code below and paste it into your Markdown file. Leave a blank line
+   above and below it. Do *not* edit the code (don't remove or add any spaces).
+1. In YouTube, visit the video URL you want to display. Copy the regular URL
+   from your browser (`https://www.youtube.com/watch?v=VIDEO-ID`) and replace
+   the video title and link in the line under `
`.
+1. In YouTube, click **Share**, and then click **Embed**.
 1. Copy the `