From eba30e2ad821f653970486c4122fcca22cee27d9 Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Wed, 16 Dec 2020 00:09:58 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 .../components/issuable_create_root.vue       |   2 +-
 .../stylesheets/framework/typography.scss     |   4 -
 app/assets/stylesheets/pages/editor.scss      |   4 -
 .../concerns/repository_storage_movable.rb    | 121 ++++++++++++++++++
 app/models/namespace_onboarding_action.rb     |   3 +-
 app/models/project.rb                         |   2 +-
 app/models/project_repository_storage_move.rb | 105 +++------------
 app/services/members/create_service.rb        |   6 +
 app/services/onboarding_progress_service.rb   |   2 +-
 app/views/projects/blob/edit.html.haml        |   5 +-
 app/views/projects/blob/new.html.haml         |   5 +-
 app/workers/all_queues.yml                    |   8 ++
 .../onboarding_user_added_worker.rb           |  17 +++
 .../pass-commit-id-to-MR-discussion.yml       |   5 +
 ...rdize-page-title-bottom-margin-styling.yml |   5 +
 config/sidekiq_queues.yml                     |   2 +
 doc/.vale/gitlab/BadgeCapitalization.yml      |   2 +-
 doc/.vale/gitlab/British.yml                  |   2 +-
 doc/.vale/gitlab/CodeblockFences.yml          |   2 +-
 doc/.vale/gitlab/CurrentStatus.yml            |   2 +-
 doc/.vale/gitlab/FirstPerson.yml              |   2 +-
 doc/.vale/gitlab/FutureTense.yml              |   2 +-
 doc/.vale/gitlab/InclusionAbleism.yml         |   2 +-
 doc/.vale/gitlab/InclusionCultural.yml        |   2 +-
 doc/.vale/gitlab/InclusionGender.yml          |   2 +-
 doc/.vale/gitlab/InternalLinkExtension.yml    |   2 +-
 doc/.vale/gitlab/InternalLinkFormat.yml       |   2 +-
 doc/.vale/gitlab/LatinTerms.yml               |   4 +-
 doc/.vale/gitlab/OutdatedVersions.yml         |   2 +-
 doc/.vale/gitlab/OxfordComma.yml              |   2 +-
 doc/.vale/gitlab/Possessive.yml               |   2 +-
 doc/.vale/gitlab/ReferenceLinks.yml           |   2 +-
 doc/.vale/gitlab/RelativeLinks.yml            |   2 +-
 doc/.vale/gitlab/SentenceLength.yml           |   2 +-
 doc/.vale/gitlab/SentenceSpacing.yml          |   2 +-
 doc/.vale/gitlab/Simplicity.yml               |   2 +-
 doc/.vale/gitlab/SubstitutionSuggestions.yml  |   2 +-
 doc/.vale/gitlab/ToDo.yml                     |   2 +-
 doc/.vale/gitlab/VersionText.yml              |   2 +-
 doc/README.md                                 |   4 +-
 doc/administration/compliance.md              |   9 +-
 doc/administration/geo/index.md               |   2 +-
 .../geo/replication/docker_registry.md        |   2 +-
 .../geo/replication/security_review.md        |   2 +-
 doc/administration/index.md                   |  48 ++++---
 doc/administration/instance_limits.md         |   4 +-
 doc/administration/nfs.md                     |   4 +-
 .../operations/ssh_certificates.md            |   8 +-
 doc/administration/pages/index.md             |   4 +-
 doc/administration/pseudonymizer.md           |   4 +-
 .../raketasks/uploads/migrate.md              |   6 +-
 .../reference_architectures/10k_users.md      |   6 -
 .../reference_architectures/25k_users.md      |   6 -
 .../reference_architectures/3k_users.md       |   6 -
 .../reference_architectures/50k_users.md      |   6 -
 .../reference_architectures/5k_users.md       |   6 -
 .../reference_architectures/index.md          |  10 +-
 doc/api/discussions.md                        |   4 +
 doc/api/freeze_periods.md                     |   2 +-
 doc/api/releases/index.md                     |   2 +-
 doc/api/releases/links.md                     |   2 +-
 doc/ci/README.md                              |   2 +-
 doc/ci/cloud_deployment/index.md              |   4 +-
 doc/ci/environments/index.md                  |   6 +-
 doc/ci/introduction/index.md                  |   2 +-
 doc/ci/review_apps/index.md                   |   2 +-
 doc/development/build_test_package.md         |   2 +-
 .../documentation/styleguide/index.md         |  11 +-
 doc/development/documentation/testing.md      |   2 +-
 doc/development/elasticsearch.md              |   6 +-
 doc/development/i18n/index.md                 |   2 +-
 doc/development/i18n/translation.md           |   2 +-
 doc/development/image_scaling.md              |   2 +-
 .../secure_partner_integration.md             |   2 +-
 doc/install/README.md                         |   6 +-
 doc/install/aws/index.md                      |   4 +-
 doc/install/azure/index.md                    |   2 +-
 doc/install/openshift_and_gitlab/index.md     |   6 +-
 doc/install/requirements.md                   |   2 +-
 doc/integration/elasticsearch.md              |   6 +-
 doc/security/two_factor_authentication.md     |   4 +-
 doc/topics/offline/index.md                   |   2 +-
 doc/topics/web_application_firewall/index.md  |   2 +-
 .../quick_start_guide.md                      |   8 +-
 doc/update/README.md                          |   2 +-
 .../admin_area/custom_project_templates.md    |   4 +-
 .../application_security/api_fuzzing/index.md |   4 +-
 .../container_scanning/index.md               |   2 +-
 .../application_security/cve_id_request.md    |   4 +-
 .../dependency_scanning/index.md              |   4 +-
 doc/user/group/custom_project_templates.md    |   2 +-
 doc/user/project/deploy_boards.md             |   2 +-
 doc/user/project/deploy_tokens/index.md       |   4 +-
 doc/user/project/import/bitbucket.md          |   4 +-
 doc/user/project/import/gitea.md              |   2 +-
 doc/user/project/import/github.md             |   4 +-
 doc/user/project/issues/index.md              |   2 +-
 doc/user/project/issues/managing_issues.md    |   2 +-
 .../index.md                                  |   2 +-
 .../lets_encrypt_integration.md               |   2 +-
 doc/user/project/pages/index.md               |   2 +-
 doc/user/project/pages/introduction.md        |   2 +-
 doc/user/project/quick_actions.md             |   2 +-
 doc/user/project/releases/index.md            |   2 +-
 lib/api/discussions.rb                        |   1 +
 lib/api/entities/note.rb                      |   1 +
 .../project_repository_storage_moves.rb       |   2 +-
 .../project_repository_storage_move_spec.rb   | 115 +----------------
 spec/requests/api/discussions_spec.rb         |  31 +++++
 .../project_repository_storage_moves_spec.rb  |   8 +-
 spec/services/members/create_service_spec.rb  |  83 ++++++------
 .../onboarding_progress_service_spec.rb       |  28 +++-
 spec/services/projects/fork_service_spec.rb   |   2 +-
 .../update_repository_storage_service_spec.rb |  12 +-
 ...ository_storage_movable_shared_examples.rb | 114 +++++++++++++++++
 .../onboarding_user_added_worker_spec.rb      |  16 +++
 116 files changed, 603 insertions(+), 442 deletions(-)
 create mode 100644 app/models/concerns/repository_storage_movable.rb
 create mode 100644 app/workers/namespaces/onboarding_user_added_worker.rb
 create mode 100644 changelogs/unreleased/pass-commit-id-to-MR-discussion.yml
 create mode 100644 changelogs/unreleased/standardize-page-title-bottom-margin-styling.yml
 create mode 100644 spec/support/shared_examples/models/concerns/repository_storage_movable_shared_examples.rb
 create mode 100644 spec/workers/namespaces/onboarding_user_added_worker_spec.rb

diff --git a/app/assets/javascripts/issuable_create/components/issuable_create_root.vue b/app/assets/javascripts/issuable_create/components/issuable_create_root.vue
index 1ef42976032..f4cbaba9313 100644
--- a/app/assets/javascripts/issuable_create/components/issuable_create_root.vue
+++ b/app/assets/javascripts/issuable_create/components/issuable_create_root.vue
@@ -29,7 +29,7 @@ export default {
 <template>
   <div class="issuable-create-container">
     <slot name="title"></slot>
-    <hr />
+    <hr class="gl-mt-0" />
     <issuable-form
       :description-preview-path="descriptionPreviewPath"
       :description-help-path="descriptionHelpPath"
diff --git a/app/assets/stylesheets/framework/typography.scss b/app/assets/stylesheets/framework/typography.scss
index 3d09edfe181..8ba1158ffa2 100644
--- a/app/assets/stylesheets/framework/typography.scss
+++ b/app/assets/stylesheets/framework/typography.scss
@@ -573,10 +573,6 @@ body {
   font-size: 1.25em;
   font-weight: $gl-font-weight-bold;
 
-  &:last-child {
-    margin-bottom: 0;
-  }
-
   &.with-button {
     line-height: 34px;
   }
diff --git a/app/assets/stylesheets/pages/editor.scss b/app/assets/stylesheets/pages/editor.scss
index acf9a654159..e0e10d63f8e 100644
--- a/app/assets/stylesheets/pages/editor.scss
+++ b/app/assets/stylesheets/pages/editor.scss
@@ -216,10 +216,6 @@
   }
 }
 
-.editor-title-row {
-  margin-bottom: 20px;
-}
-
 .popover.suggest-gitlab-ci-yml {
   z-index: $header-zindex - 1;
 }
diff --git a/app/models/concerns/repository_storage_movable.rb b/app/models/concerns/repository_storage_movable.rb
new file mode 100644
index 00000000000..a45b4626628
--- /dev/null
+++ b/app/models/concerns/repository_storage_movable.rb
@@ -0,0 +1,121 @@
+# frozen_string_literal: true
+
+module RepositoryStorageMovable
+  extend ActiveSupport::Concern
+  include AfterCommitQueue
+
+  included do
+    scope :order_created_at_desc, -> { order(created_at: :desc) }
+
+    validates :container, presence: true
+    validates :state, presence: true
+    validates :source_storage_name,
+      on: :create,
+      presence: true,
+      inclusion: { in: ->(_) { Gitlab.config.repositories.storages.keys } }
+    validates :destination_storage_name,
+      on: :create,
+      presence: true,
+      inclusion: { in: ->(_) { Gitlab.config.repositories.storages.keys } }
+    validate :container_repository_writable, on: :create
+
+    default_value_for(:destination_storage_name, allows_nil: false) do
+      pick_repository_storage
+    end
+
+    state_machine initial: :initial do
+      event :schedule do
+        transition initial: :scheduled
+      end
+
+      event :start do
+        transition scheduled: :started
+      end
+
+      event :finish_replication do
+        transition started: :replicated
+      end
+
+      event :finish_cleanup do
+        transition replicated: :finished
+      end
+
+      event :do_fail do
+        transition [:initial, :scheduled, :started] => :failed
+        transition replicated: :cleanup_failed
+      end
+
+      around_transition initial: :scheduled do |storage_move, block|
+        block.call
+
+        begin
+          storage_move.container.set_repository_read_only!(skip_git_transfer_check: true)
+        rescue => err
+          storage_move.add_error(err.message)
+          next false
+        end
+
+        storage_move.run_after_commit do
+          storage_move.schedule_repository_storage_update_worker
+        end
+
+        true
+      end
+
+      before_transition started: :replicated do |storage_move|
+        storage_move.container.set_repository_writable!
+
+        storage_move.update_repository_storage(storage_move.destination_storage_name)
+      end
+
+      before_transition started: :failed do |storage_move|
+        storage_move.container.set_repository_writable!
+      end
+
+      state :initial, value: 1
+      state :scheduled, value: 2
+      state :started, value: 3
+      state :finished, value: 4
+      state :failed, value: 5
+      state :replicated, value: 6
+      state :cleanup_failed, value: 7
+    end
+  end
+
+  class_methods do
+    private
+
+    def pick_repository_storage
+      container_klass = reflect_on_association(:container).class_name.constantize
+
+      container_klass.pick_repository_storage
+    end
+  end
+
+  # Projects, snippets, and group wikis has different db structure. In projects,
+  # we need to update some columns in this step, but we don't with the other resources.
+  #
+  # Therefore, we create this No-op method for snippets and wikis and let project
+  # overwrite it in their implementation.
+  def update_repository_storage(new_storage)
+    # No-op
+  end
+
+  def schedule_repository_storage_update_worker
+    raise NotImplementedError
+  end
+
+  def add_error(message)
+    errors.add(error_key, message)
+  end
+
+  private
+
+  def container_repository_writable
+    add_error(_('is read only')) if container&.repository_read_only?
+  end
+
+  def error_key
+    raise NotImplementedError
+  end
+end
diff --git a/app/models/namespace_onboarding_action.rb b/app/models/namespace_onboarding_action.rb
index bf4df7de13f..43dd872673c 100644
--- a/app/models/namespace_onboarding_action.rb
+++ b/app/models/namespace_onboarding_action.rb
@@ -9,7 +9,8 @@ class NamespaceOnboardingAction < ApplicationRecord
     subscription_created: 1,
     git_write: 2,
     merge_request_created: 3,
-    git_read: 4
+    git_read: 4,
+    user_added: 6
   }.freeze
 
   enum action: ACTIONS
diff --git a/app/models/project.rb b/app/models/project.rb
index de4a3cf6bff..579df1abbe2 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -342,7 +342,7 @@ class Project < ApplicationRecord
 
   has_many :daily_build_group_report_results, class_name: 'Ci::DailyBuildGroupReportResult'
 
-  has_many :repository_storage_moves, class_name: 'ProjectRepositoryStorageMove'
+  has_many :repository_storage_moves, class_name: 'ProjectRepositoryStorageMove', inverse_of: :container
 
   has_many :webide_pipelines, -> { webide_source }, class_name: 'Ci::Pipeline', inverse_of: :project
   has_many :reviews, inverse_of: :project
diff --git a/app/models/project_repository_storage_move.rb b/app/models/project_repository_storage_move.rb
index f6b96a15099..1e3782a1fb5 100644
--- a/app/models/project_repository_storage_move.rb
+++ b/app/models/project_repository_storage_move.rb
@@ -4,100 +4,31 @@
 # project. For example, moving a project to another gitaly node to help
 # balance storage capacity.
 class ProjectRepositoryStorageMove < ApplicationRecord
-  include AfterCommitQueue
+  extend ::Gitlab::Utils::Override
+  include RepositoryStorageMovable
 
-  belongs_to :project, inverse_of: :repository_storage_moves
+  belongs_to :container, class_name: 'Project', inverse_of: :repository_storage_moves, foreign_key: :project_id
+  alias_attribute :project, :container
+  scope :with_projects, -> { includes(container: :route) }
 
-  validates :project, presence: true
-  validates :state, presence: true
-  validates :source_storage_name,
-    on: :create,
-    presence: true,
-    inclusion: { in: ->(_) { Gitlab.config.repositories.storages.keys } }
-  validates :destination_storage_name,
-    on: :create,
-    presence: true,
-    inclusion: { in: ->(_) { Gitlab.config.repositories.storages.keys } }
-  validate :project_repository_writable, on: :create
-
-  default_value_for(:destination_storage_name, allows_nil: false) do
-    pick_repository_storage
+  override :update_repository_storage
+  def update_repository_storage(new_storage)
+    container.update_column(:repository_storage, new_storage)
   end
 
-  state_machine initial: :initial do
-    event :schedule do
-      transition initial: :scheduled
-    end
-
-    event :start do
-      transition scheduled: :started
-    end
-
-    event :finish_replication do
-      transition started: :replicated
-    end
-
-    event :finish_cleanup do
-      transition replicated: :finished
-    end
-
-    event :do_fail do
-      transition [:initial, :scheduled, :started] => :failed
-      transition replicated: :cleanup_failed
-    end
-
-    around_transition initial: :scheduled do |storage_move, block|
-      block.call
-
-      begin
-        storage_move.project.set_repository_read_only!(skip_git_transfer_check: true)
-      rescue => err
-        storage_move.errors.add(:project, err.message)
-        next false
-      end
-
-      storage_move.run_after_commit do
-        ProjectUpdateRepositoryStorageWorker.perform_async(
-          storage_move.project_id,
-          storage_move.destination_storage_name,
-          storage_move.id
-        )
-      end
-
-      true
-    end
-
-    before_transition started: :replicated do |storage_move|
-      storage_move.project.set_repository_writable!
-
-      storage_move.project.update_column(:repository_storage, storage_move.destination_storage_name)
-    end
-
-    before_transition started: :failed do |storage_move|
-      storage_move.project.set_repository_writable!
-    end
-
-    state :initial, value: 1
-    state :scheduled, value: 2
-    state :started, value: 3
-    state :finished, value: 4
-    state :failed, value: 5
-    state :replicated, value: 6
-    state :cleanup_failed, value: 7
-  end
-
-  scope :order_created_at_desc, -> { order(created_at: :desc) }
-  scope :with_projects, -> { includes(project: :route) }
-
-  class << self
-    def pick_repository_storage
-      Project.pick_repository_storage
-    end
+  override :schedule_repository_storage_update_worker
+  def schedule_repository_storage_update_worker
+    ProjectUpdateRepositoryStorageWorker.perform_async(
+      project_id,
+      destination_storage_name,
+      id
+    )
   end
 
   private
 
-  def project_repository_writable
-    errors.add(:project, _('is read only')) if project&.repository_read_only?
+  override :error_key
+  def error_key
+    :project
   end
 end
diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb
index 088e6f031c8..3588cda180f 100644
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
@@ -38,6 +38,8 @@ module Members
         end
       end
 
+      enqueue_onboarding_progress_action(source) if members.size > errors.size
+
       return success unless errors.any?
 
       error(errors.to_sentence)
@@ -50,6 +52,10 @@ module Members
 
       limit && limit < 0 ? nil : limit
     end
+
+    def enqueue_onboarding_progress_action(source)
+      Namespaces::OnboardingUserAddedWorker.perform_async(source.id)
+    end
   end
 end
 
diff --git a/app/services/onboarding_progress_service.rb b/app/services/onboarding_progress_service.rb
index c45edcaaf33..ebe7caabdef 100644
--- a/app/services/onboarding_progress_service.rb
+++ b/app/services/onboarding_progress_service.rb
@@ -2,7 +2,7 @@
 
 class OnboardingProgressService
   def initialize(namespace)
-    @namespace = namespace
+    @namespace = namespace.root_ancestor
   end
 
   def execute(action:)
diff --git a/app/views/projects/blob/edit.html.haml b/app/views/projects/blob/edit.html.haml
index 54c47e7af38..abfed450316 100644
--- a/app/views/projects/blob/edit.html.haml
+++ b/app/views/projects/blob/edit.html.haml
@@ -9,9 +9,8 @@
       = link_to "the file", project_blob_path(@project, tree_join(@branch_name, @file_path)), target: "_blank", rel: 'noopener noreferrer', class: 'gl-link'
       and make sure your changes will not unintentionally remove theirs.
 
-.editor-title-row
-  %h3.page-title.blob-edit-page-title
-    Edit file
+%h3.page-title.blob-edit-page-title
+  Edit file
 .file-editor
   %ul.nav-links.no-bottom.js-edit-mode.nav.nav-tabs
     %li.active
diff --git a/app/views/projects/blob/new.html.haml b/app/views/projects/blob/new.html.haml
index 2a33afabb7c..8722819fe4f 100644
--- a/app/views/projects/blob/new.html.haml
+++ b/app/views/projects/blob/new.html.haml
@@ -1,9 +1,8 @@
 - breadcrumb_title _("Repository")
 - page_title _("New File"), @path.presence, @ref
 
-.editor-title-row
-  %h3.page-title.blob-new-page-title
-    New file
+%h3.page-title.blob-new-page-title
+  New file
 .file-editor
   = form_tag(project_create_blob_path(@project, @id), method: :post, class: 'js-edit-blob-form js-new-blob-form js-quick-submit js-requires-input', data: blob_editor_paths(@project)) do
     = render 'projects/blob/editor', ref: @ref
diff --git a/app/workers/all_queues.yml b/app/workers/all_queues.yml
index 098d883744d..1f2e8213b64 100644
--- a/app/workers/all_queues.yml
+++ b/app/workers/all_queues.yml
@@ -1787,6 +1787,14 @@
   :weight: 1
   :idempotent:
   :tags: []
+- :name: namespaces_onboarding_user_added
+  :feature_category: :users
+  :has_external_dependencies:
+  :urgency: :low
+  :resource_boundary: :unknown
+  :weight: 1
+  :idempotent: true
+  :tags: []
 - :name: new_issue
   :feature_category: :issue_tracking
   :has_external_dependencies:
diff --git a/app/workers/namespaces/onboarding_user_added_worker.rb b/app/workers/namespaces/onboarding_user_added_worker.rb
new file mode 100644
index 00000000000..02608268d6f
--- /dev/null
+++ b/app/workers/namespaces/onboarding_user_added_worker.rb
@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+module Namespaces
+  class OnboardingUserAddedWorker
+    include ApplicationWorker
+
+    feature_category :users
+    urgency :low
+
+    idempotent!
+
+    def perform(namespace_id)
+      namespace = Namespace.find(namespace_id)
+      OnboardingProgressService.new(namespace).execute(action: :user_added)
+    end
+  end
+end
diff --git a/changelogs/unreleased/pass-commit-id-to-MR-discussion.yml b/changelogs/unreleased/pass-commit-id-to-MR-discussion.yml
new file mode 100644
index 00000000000..d5cc490b233
--- /dev/null
+++ b/changelogs/unreleased/pass-commit-id-to-MR-discussion.yml
@@ -0,0 +1,5 @@
+---
+title: Allow passing `commit_id` when creating MR discussions via the API and expose `commit_id` for MR diff notes
+merge_request: 47130
+author: Johannes Altmanninger @krobelus
+type: added
diff --git a/changelogs/unreleased/standardize-page-title-bottom-margin-styling.yml b/changelogs/unreleased/standardize-page-title-bottom-margin-styling.yml
new file mode 100644
index 00000000000..2da49450762
--- /dev/null
+++ b/changelogs/unreleased/standardize-page-title-bottom-margin-styling.yml
@@ -0,0 +1,5 @@
+---
+title: 'Remove last-child bottom-margin: 0 from page-title class'
+merge_request: 49884
+author:
+type: fixed
diff --git a/config/sidekiq_queues.yml b/config/sidekiq_queues.yml
index 44a5d69dbde..6f8c0b352fd 100644
--- a/config/sidekiq_queues.yml
+++ b/config/sidekiq_queues.yml
@@ -198,6 +198,8 @@
   - 1
 - - namespaceless_project_destroy
   - 1
+- - namespaces_onboarding_user_added
+  - 1
 - - new_epic
   - 2
 - - new_issue
diff --git a/doc/.vale/gitlab/BadgeCapitalization.yml b/doc/.vale/gitlab/BadgeCapitalization.yml
index caf7143e254..3da5831ed56 100644
--- a/doc/.vale/gitlab/BadgeCapitalization.yml
+++ b/doc/.vale/gitlab/BadgeCapitalization.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Badge "%s" must be capitalized.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#product-badges
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#product-tier-badges
 level: error
 scope: raw
 raw:
diff --git a/doc/.vale/gitlab/British.yml b/doc/.vale/gitlab/British.yml
index 5b7821c17c2..65842ad7aa5 100644
--- a/doc/.vale/gitlab/British.yml
+++ b/doc/.vale/gitlab/British.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: substitution
 message: 'Use the US spelling "%s" instead of the British "%s".'
-link: https://about.gitlab.com/handbook/communication/#top-misused-terms
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#language
 level: error
 ignorecase: true
 swap:
diff --git a/doc/.vale/gitlab/CodeblockFences.yml b/doc/.vale/gitlab/CodeblockFences.yml
index 7258a8ef475..6c2d94e7b8d 100644
--- a/doc/.vale/gitlab/CodeblockFences.yml
+++ b/doc/.vale/gitlab/CodeblockFences.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Syntax highlighting hint "%s" must be one of: yaml, ruby, plaintext, markdown, javascript, shell, golang, python, dockerfile, or typescript.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#code-blocks
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#code-blocks
 level: error
 scope: raw
 raw:
diff --git a/doc/.vale/gitlab/CurrentStatus.yml b/doc/.vale/gitlab/CurrentStatus.yml
index 2f0e9f21bb4..16a6995843a 100644
--- a/doc/.vale/gitlab/CurrentStatus.yml
+++ b/doc/.vale/gitlab/CurrentStatus.yml
@@ -8,6 +8,6 @@ extends: existence
 message: 'Avoid words like "%s" that promise future changes, because documentation is about the current state of the product.'
 level: suggestion
 ignorecase: true
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#usage-list
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#usage-list
 tokens:
   - currently
diff --git a/doc/.vale/gitlab/FirstPerson.yml b/doc/.vale/gitlab/FirstPerson.yml
index d247f137501..6fc93d9515c 100644
--- a/doc/.vale/gitlab/FirstPerson.yml
+++ b/doc/.vale/gitlab/FirstPerson.yml
@@ -8,7 +8,7 @@ extends: existence
 message: '"%s" is a first-person pronoun. Use second- or third-person pronouns (like we, you, us, one) instead.'
 level: warning
 ignorecase: true
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#usage-list
 tokens:
   - '\bI[ ,;:?!"]|\bI\x27.{1,2}'
   - me
diff --git a/doc/.vale/gitlab/FutureTense.yml b/doc/.vale/gitlab/FutureTense.yml
index 69c77e7bc36..d7001d57899 100644
--- a/doc/.vale/gitlab/FutureTense.yml
+++ b/doc/.vale/gitlab/FutureTense.yml
@@ -9,7 +9,7 @@ extends: existence
 message: 'Avoid using future tense: "%s". Use present tense instead.'
 ignorecase: true
 level: warning
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#usage-list
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#usage-list
 raw:
   - "(going to( |\n|[[:punct:]])[a-zA-Z]*|"
   - "will( |\n|[[:punct:]])[a-zA-Z]*|"
diff --git a/doc/.vale/gitlab/InclusionAbleism.yml b/doc/.vale/gitlab/InclusionAbleism.yml
index 29b26547130..1ebb6a97cf8 100644
--- a/doc/.vale/gitlab/InclusionAbleism.yml
+++ b/doc/.vale/gitlab/InclusionAbleism.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: substitution
 message: 'Use inclusive language. Consider "%s" instead of "%s".'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#inclusive-language
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#inclusive-language
 level: suggestion
 ignorecase: true
 swap:
diff --git a/doc/.vale/gitlab/InclusionCultural.yml b/doc/.vale/gitlab/InclusionCultural.yml
index 5bfad84f100..6f63d1725fc 100644
--- a/doc/.vale/gitlab/InclusionCultural.yml
+++ b/doc/.vale/gitlab/InclusionCultural.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: substitution
 message: 'Use inclusive language. Consider "%s" instead of "%s".'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#inclusive-language
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#inclusive-language
 level: warning
 ignorecase: true
 swap:
diff --git a/doc/.vale/gitlab/InclusionGender.yml b/doc/.vale/gitlab/InclusionGender.yml
index 389d76d7a24..313a1cc42dc 100644
--- a/doc/.vale/gitlab/InclusionGender.yml
+++ b/doc/.vale/gitlab/InclusionGender.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: substitution
 message: 'Use inclusive language. Consider "%s" instead of "%s".'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#inclusive-language
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#inclusive-language
 level: suggestion
 ignorecase: true
 swap:
diff --git a/doc/.vale/gitlab/InternalLinkExtension.yml b/doc/.vale/gitlab/InternalLinkExtension.yml
index 9b5a3499815..0b1baaf667c 100644
--- a/doc/.vale/gitlab/InternalLinkExtension.yml
+++ b/doc/.vale/gitlab/InternalLinkExtension.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Link "%s" must use the .md file extension.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#links-to-internal-documentation
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#links-to-internal-documentation
 level: error
 scope: raw
 raw:
diff --git a/doc/.vale/gitlab/InternalLinkFormat.yml b/doc/.vale/gitlab/InternalLinkFormat.yml
index 9a72778140e..51d5198a0ce 100644
--- a/doc/.vale/gitlab/InternalLinkFormat.yml
+++ b/doc/.vale/gitlab/InternalLinkFormat.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Link "%s" must not start with "./".'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#links-to-internal-documentation
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#links-to-internal-documentation
 level: error
 scope: raw
 raw:
diff --git a/doc/.vale/gitlab/LatinTerms.yml b/doc/.vale/gitlab/LatinTerms.yml
index 26dba42839a..79ba4c17651 100644
--- a/doc/.vale/gitlab/LatinTerms.yml
+++ b/doc/.vale/gitlab/LatinTerms.yml
@@ -1,12 +1,12 @@
 ---
 # Warning: gitlab.LatinTerms
 #
-# Checks for use of latin terms.
+# Checks for use of Latin terms.
 #
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: substitution
 message: 'Use "%s" instead of "%s", but consider rewriting the sentence.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#usage-list
 level: warning
 nonword: true
 ignorecase: true
diff --git a/doc/.vale/gitlab/OutdatedVersions.yml b/doc/.vale/gitlab/OutdatedVersions.yml
index 2ce61ee5798..05323726838 100644
--- a/doc/.vale/gitlab/OutdatedVersions.yml
+++ b/doc/.vale/gitlab/OutdatedVersions.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Can this reference to "%s" be refactored?'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#importance-of-referencing-gitlab-versions-and-tiers
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#gitlab-versions
 level: suggestion
 nonword: true
 ignorecase: true
diff --git a/doc/.vale/gitlab/OxfordComma.yml b/doc/.vale/gitlab/OxfordComma.yml
index 334db5d0388..0425d9e1dd0 100644
--- a/doc/.vale/gitlab/OxfordComma.yml
+++ b/doc/.vale/gitlab/OxfordComma.yml
@@ -7,7 +7,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Use a comma before the last "and" or "or" in a list of four or more items.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#punctuation
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#punctuation
 level: warning
 raw:
   - '(?:[\w-_` ]+,){2,}(?:[\w-_` ]+) (and |or )'
diff --git a/doc/.vale/gitlab/Possessive.yml b/doc/.vale/gitlab/Possessive.yml
index ca4faf8cfe5..98732cbade2 100644
--- a/doc/.vale/gitlab/Possessive.yml
+++ b/doc/.vale/gitlab/Possessive.yml
@@ -8,7 +8,7 @@ extends: existence
 message: 'Rewrite "%s" to not use "’s".'
 level: warning
 ignorecase: true
-link: https://docs.gitlab.com/ee/development/documentation/styleguide/#contractions
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#contractions
 tokens:
   - GitLab's  # Straight apostrophe.
   - GitLab’s  # Curly closing apostrophe.
diff --git a/doc/.vale/gitlab/ReferenceLinks.yml b/doc/.vale/gitlab/ReferenceLinks.yml
index 49e6ed5a531..0df1f359107 100644
--- a/doc/.vale/gitlab/ReferenceLinks.yml
+++ b/doc/.vale/gitlab/ReferenceLinks.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Link "%s" must be inline.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#basic-link-criteria
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#basic-link-criteria
 level: error
 scope: raw
 raw:
diff --git a/doc/.vale/gitlab/RelativeLinks.yml b/doc/.vale/gitlab/RelativeLinks.yml
index 1ae73472f8a..14ffc4bd0b8 100644
--- a/doc/.vale/gitlab/RelativeLinks.yml
+++ b/doc/.vale/gitlab/RelativeLinks.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'Link "%s" must be a relative link with a .md extension.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#links-to-internal-documentation
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#links-to-internal-documentation
 level: error
 scope: raw
 raw:
diff --git a/doc/.vale/gitlab/SentenceLength.yml b/doc/.vale/gitlab/SentenceLength.yml
index da9fa052584..c60df1803e2 100644
--- a/doc/.vale/gitlab/SentenceLength.yml
+++ b/doc/.vale/gitlab/SentenceLength.yml
@@ -7,7 +7,7 @@
 extends: occurrence
 message: 'Shorter sentences improve readability (max 25 words).'
 scope: sentence
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#language
 level: warning
 max: 25
 token: \b(\w+)\b
diff --git a/doc/.vale/gitlab/SentenceSpacing.yml b/doc/.vale/gitlab/SentenceSpacing.yml
index e6da920222c..884d4b57508 100644
--- a/doc/.vale/gitlab/SentenceSpacing.yml
+++ b/doc/.vale/gitlab/SentenceSpacing.yml
@@ -9,7 +9,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: '"%s" must contain one and only one space.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#punctuation
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#punctuation
 level: error
 nonword: true
 tokens:
diff --git a/doc/.vale/gitlab/Simplicity.yml b/doc/.vale/gitlab/Simplicity.yml
index fc5bfe5a35b..44e78f89c20 100644
--- a/doc/.vale/gitlab/Simplicity.yml
+++ b/doc/.vale/gitlab/Simplicity.yml
@@ -8,7 +8,7 @@ extends: existence
 message: 'Avoid words like "%s" that imply ease of use, because the user may find this action hard.'
 level: suggestion
 ignorecase: true
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#usage-list
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#usage-list
 tokens:
   - easy
   - easily
diff --git a/doc/.vale/gitlab/SubstitutionSuggestions.yml b/doc/.vale/gitlab/SubstitutionSuggestions.yml
index bc515465dc3..be5726a8d8f 100644
--- a/doc/.vale/gitlab/SubstitutionSuggestions.yml
+++ b/doc/.vale/gitlab/SubstitutionSuggestions.yml
@@ -7,7 +7,7 @@
 # For a list of all options, see https://errata-ai.github.io/vale/styles/
 extends: substitution
 message: 'Consider %s instead of "%s".'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#language
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#language
 level: suggestion
 ignorecase: true
 swap:
diff --git a/doc/.vale/gitlab/ToDo.yml b/doc/.vale/gitlab/ToDo.yml
index b3c5f6077b1..a3725cb7f6b 100644
--- a/doc/.vale/gitlab/ToDo.yml
+++ b/doc/.vale/gitlab/ToDo.yml
@@ -6,7 +6,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: substitution
 message: 'Use "to-do item" in most cases, or "Add a to do" if referring to the UI button.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#feature-names
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#feature-names
 level: warning
 ignorecase: false
 swap:
diff --git a/doc/.vale/gitlab/VersionText.yml b/doc/.vale/gitlab/VersionText.yml
index e59b936ae3f..e66a62497b1 100644
--- a/doc/.vale/gitlab/VersionText.yml
+++ b/doc/.vale/gitlab/VersionText.yml
@@ -16,7 +16,7 @@
 # For a list of all options, see https://errata-ai.gitbook.io/vale/getting-started/styles
 extends: existence
 message: 'This introduced-in line is not formatted correctly.'
-link: https://docs.gitlab.com/ee/development/documentation/styleguide.html#text-for-documentation-requiring-version-text
+link: https://docs.gitlab.com/ee/development/documentation/styleguide/index.html#version-text-in-the-version-history
 level: error
 scope: raw
 raw:
diff --git a/doc/README.md b/doc/README.md
index 0168709566f..5ce26202936 100644
--- a/doc/README.md
+++ b/doc/README.md
@@ -7,8 +7,8 @@ description: 'Learn how to use and administer GitLab, the most scalable Git-base
 ---
 
 <div class="d-none">
-  <em>Visit <a href="https://docs.gitlab.com/ee/">docs.gitlab.com</a> for optimized
-  navigation, discoverability, and readability.</em>
+  <h3>Visit <a href="https://docs.gitlab.com/ee/">docs.gitlab.com</a> for the latest version
+  of this help information with enhanced navigation, discoverability, and readability.</h3>
 </div>
 <!-- the div above will not display on the docs site but will display on /help -->
 
diff --git a/doc/administration/compliance.md b/doc/administration/compliance.md
index 0ab7cf72afe..85b72d7b18f 100644
--- a/doc/administration/compliance.md
+++ b/doc/administration/compliance.md
@@ -6,9 +6,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Compliance features
 
-You can configure the following GitLab features to help ensure that your GitLab instance meets common compliance standards. Click a feature name for further documentation.
+You can configure the following GitLab features to help ensure that your GitLab
+instance meets common compliance standards. Click a feature name for additional
+documentation.
 
-GitLab’s [security features](../security/README.md) may also help you meet relevant compliance standards.
+The [security features](../security/README.md) in GitLab may also help you meet
+relevant compliance standards.
 
 |Feature   |GitLab tier |GitLab.com |
 | ---------| :--------: | :-------: |
@@ -23,4 +26,4 @@ GitLab’s [security features](../security/README.md) may also help you meet rel
 |**[Audit events](audit_events.md)**<br>To maintain the integrity of your code, GitLab Enterprise Edition Premium gives admins the ability to view any modifications made within the GitLab server in an advanced audit events system, so you can control, analyze, and track every change.|Premium+||
 |**[Auditor users](auditor_users.md)**<br>Auditor users are users who are given read-only access to all projects, groups, and other resources on the GitLab instance.|Premium+||
 |**[Credentials inventory](../user/admin_area/credentials_inventory.md)**<br>With a credentials inventory, GitLab administrators can keep track of the credentials used by all of the users in their GitLab instance. |Ultimate||
-|**Separation of Duties using [Protected branches](../user/project/protected_branches.md#protected-branches-approval-by-code-owners) and [custom CI Configuration Paths](../ci/pipelines/settings.md#custom-ci-configuration-path)**<br> GitLab Silver and Premium users can leverage GitLab's cross-project YAML configuration's to define deployers of code and developers of code. View the [Separation of Duties Deploy Project](https://gitlab.com/guided-explorations/separation-of-duties-deploy/blob/master/README.md) and [Separation of Duties Project](https://gitlab.com/guided-explorations/separation-of-duties/blob/master/README.md) to see how to use this set up to define these roles.|Premium+||
+|**Separation of Duties using [Protected branches](../user/project/protected_branches.md#protected-branches-approval-by-code-owners) and [custom CI Configuration Paths](../ci/pipelines/settings.md#custom-ci-configuration-path)**<br> GitLab Silver and Premium users can leverage the GitLab cross-project YAML configurations to define deployers of code and developers of code. View the [Separation of Duties Deploy Project](https://gitlab.com/guided-explorations/separation-of-duties-deploy/blob/master/README.md) and [Separation of Duties Project](https://gitlab.com/guided-explorations/separation-of-duties/blob/master/README.md) to see how to use this set up to define these roles.|Premium+||
diff --git a/doc/administration/geo/index.md b/doc/administration/geo/index.md
index 408dd5e12df..fca33434f11 100644
--- a/doc/administration/geo/index.md
+++ b/doc/administration/geo/index.md
@@ -124,7 +124,7 @@ The following are required to run Geo:
 - Git-lfs 2.4.2+ on the user side when using LFS
 - All nodes must run the same GitLab version.
 
-Additionally, check GitLab's [minimum requirements](../../install/requirements.md),
+Additionally, check the GitLab [minimum requirements](../../install/requirements.md),
 and we recommend you use:
 
 - At least GitLab Enterprise Edition 10.0 for basic Geo features.
diff --git a/doc/administration/geo/replication/docker_registry.md b/doc/administration/geo/replication/docker_registry.md
index bfef096cd0a..f92a878662e 100644
--- a/doc/administration/geo/replication/docker_registry.md
+++ b/doc/administration/geo/replication/docker_registry.md
@@ -17,7 +17,7 @@ distributed storage (`azure`, `gcs`, `s3`, `swift`, or `oss`) for your Docker
 Registry on the **primary** node, you can use the same storage for a **secondary**
 Docker Registry as well. For more information, read the
 [Load balancing considerations](https://docs.docker.com/registry/deploying/#load-balancing-considerations)
-when deploying the Registry, and how to set up the storage driver for GitLab's
+when deploying the Registry, and how to set up the storage driver for the GitLab
 integrated [Container Registry](../../packages/container_registry.md#use-object-storage).
 
 ## Replicating Docker Registry
diff --git a/doc/administration/geo/replication/security_review.md b/doc/administration/geo/replication/security_review.md
index d061cee75ab..7c15662340c 100644
--- a/doc/administration/geo/replication/security_review.md
+++ b/doc/administration/geo/replication/security_review.md
@@ -33,7 +33,7 @@ from [owasp.org](https://owasp.org/).
 
 ### How can the data be classified into categories according to its sensitivity?
 
-- GitLab’s model of sensitivity is centered around public vs. internal vs.
+- The GitLab model of sensitivity is centered around public vs. internal vs.
   private projects. Geo replicates them all indiscriminately. “Selective sync”
   exists for files and repositories (but not database content), which would permit
   only less-sensitive projects to be replicated to a **secondary** node if desired.
diff --git a/doc/administration/index.md b/doc/administration/index.md
index 031f81d174a..32c0b1b0712 100644
--- a/doc/administration/index.md
+++ b/doc/administration/index.md
@@ -51,26 +51,40 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 - [Global user settings](user_settings.md): Configure instance-wide user permissions.
 - [Polling](polling.md): Configure how often the GitLab UI polls for updates.
 - [GitLab Pages configuration](pages/index.md): Enable and configure GitLab Pages.
-- [GitLab Pages configuration for GitLab source installations](pages/source.md): Enable and configure GitLab Pages on [source installations](../install/installation.md#installation-from-source).
+- [GitLab Pages configuration for GitLab source installations](pages/source.md):
+  Enable and configure GitLab Pages on [source installations](../install/installation.md#installation-from-source).
 - [Uploads administration](uploads.md): Configure GitLab uploads storage.
 - [Environment variables](environment_variables.md): Supported environment
   variables that can be used to override their default values to configure
   GitLab.
-- [Plugins](file_hooks.md): With custom plugins, GitLab administrators can introduce custom integrations without modifying GitLab's source code.
+- [Plugins](file_hooks.md): With custom plugins, GitLab administrators can
+  introduce custom integrations without modifying GitLab source code.
 - [Enforcing Terms of Service](../user/admin_area/settings/terms.md)
 - [Third party offers](../user/admin_area/settings/third_party_offers.md)
-- [Compliance](compliance.md): A collection of features from across the application that you may configure to help ensure that your GitLab instance and DevOps workflow meet compliance standards.
-- [Diff limits](../user/admin_area/diff_limits.md): Configure the diff rendering size limits of branch comparison pages.
-- [Merge request diffs storage](merge_request_diffs.md): Configure merge requests diffs external storage.
-- [Broadcast Messages](../user/admin_area/broadcast_messages.md): Send messages to GitLab users through the UI.
-- [Elasticsearch](../integration/elasticsearch.md): Enable Elasticsearch to empower GitLab's Advanced Search. Useful when you deal with a huge amount of data. **(STARTER ONLY)**
-- [External Classification Policy Authorization](../user/admin_area/settings/external_authorization.md) **(PREMIUM ONLY)**
-- [Upload a license](../user/admin_area/license.md): Upload a license to unlock features that are in paid tiers of GitLab. **(STARTER ONLY)**
-- [Admin Area](../user/admin_area/index.md): for self-managed instance-wide configuration and maintenance.
-- [S/MIME Signing](smime_signing_email.md): how to sign all outgoing notification emails with S/MIME.
-- [Enabling and disabling features flags](feature_flags.md): how to enable and disable GitLab features deployed behind feature flags.
+- [Compliance](compliance.md): A collection of features from across the
+  application that you may configure to help ensure that your GitLab instance
+  and DevOps workflow meet compliance standards.
+- [Diff limits](../user/admin_area/diff_limits.md): Configure the diff rendering
+  size limits of branch comparison pages.
+- [Merge request diffs storage](merge_request_diffs.md): Configure merge
+  requests diffs external storage.
+- [Broadcast Messages](../user/admin_area/broadcast_messages.md): Send messages
+  to GitLab users through the UI.
+- [Elasticsearch](../integration/elasticsearch.md): Enable Elasticsearch to
+  empower Advanced Search. Useful when you deal with a huge amount of data.
+  **(STARTER ONLY)**
+- [External Classification Policy Authorization](../user/admin_area/settings/external_authorization.md)
+  **(PREMIUM ONLY)**
+- [Upload a license](../user/admin_area/license.md): Upload a license to unlock
+  features that are in paid tiers of GitLab. **(STARTER ONLY)**
+- [Admin Area](../user/admin_area/index.md): for self-managed instance-wide
+  configuration and maintenance.
+- [S/MIME Signing](smime_signing_email.md): how to sign all outgoing notification
+  emails with S/MIME.
+- [Enabling and disabling features flags](feature_flags.md): how to enable and
+  disable GitLab features deployed behind feature flags.
 
-#### Customizing GitLab's appearance
+#### Customizing GitLab appearance
 
 - [Header logo](../user/admin_area/appearance.md#navigation-bar): Change the logo on all pages and email headers.
 - [Favicon](../user/admin_area/appearance.md#favicon): Change the default favicon to your own logo.
@@ -104,7 +118,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 - [Mattermost](https://docs.gitlab.com/omnibus/gitlab-mattermost/): Integrate with [Mattermost](https://mattermost.com), an open source, private cloud workplace for web messaging.
 - [PlantUML](integration/plantuml.md): Create simple diagrams in AsciiDoc and Markdown documents
   created in snippets, wikis, and repositories.
-- [Web terminals](integration/terminal.md): Provide terminal access to your applications deployed to Kubernetes from within GitLab's CI/CD [environments](../ci/environments/index.md#web-terminals).
+- [Web terminals](integration/terminal.md): Provide terminal access to your applications deployed to Kubernetes from within GitLab CI/CD [environments](../ci/environments/index.md#web-terminals).
 
 ## User settings and permissions
 
@@ -134,7 +148,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 ## Project settings
 
 - [Issue closing pattern](issue_closing_pattern.md): Customize how to close an issue from commit messages.
-- [Gitaly](gitaly/index.md): Configuring Gitaly, GitLab's Git repository storage service.
+- [Gitaly](gitaly/index.md): Configuring Gitaly, the Git repository storage service for GitLab.
 - [Default labels](../user/admin_area/labels.md): Create labels that are automatically added to every new project.
 - [Restrict the use of public or internal projects](../public_access/public_access.md#restricting-the-use-of-public-or-internal-projects): Restrict the use of visibility levels for users when they create a project or a snippet.
 - [Custom project templates](../user/admin_area/custom_project_templates.md): Configure a set of projects to be used as custom templates when creating a new project. **(PREMIUM ONLY)**
@@ -186,7 +200,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 - [Monitoring GitLab](monitoring/index.md):
   - [Monitoring uptime](../user/admin_area/monitoring/health_check.md): Check the server status using the health check endpoint.
   - [IP whitelist](monitoring/ip_whitelist.md): Monitor endpoints that provide health check information when probed.
-  - [Monitoring GitHub imports](monitoring/github_imports.md): GitLab's GitHub Importer displays Prometheus metrics to monitor the health and progress of the importer.
+  - [Monitoring GitHub imports](monitoring/github_imports.md): The GitLab GitHub Importer displays Prometheus metrics to monitor the health and progress of the importer.
 
 ### Performance Monitoring
 
@@ -199,7 +213,7 @@ Learn how to install, configure, update, and maintain your GitLab instance.
 
 ## Analytics
 
-- [Pseudonymizer](pseudonymizer.md): Export data from GitLab's database to CSV files in a secure way. **(ULTIMATE)**
+- [Pseudonymizer](pseudonymizer.md): Export data from a GitLab database to CSV files in a secure way. **(ULTIMATE)**
 
 ## Troubleshooting
 
diff --git a/doc/administration/instance_limits.md b/doc/administration/instance_limits.md
index a7756e46353..0eede5f3ca5 100644
--- a/doc/administration/instance_limits.md
+++ b/doc/administration/instance_limits.md
@@ -499,8 +499,8 @@ as the overall index size. This value defaults to `1024 KiB` (1 MiB) as any
 text files larger than this likely aren't meant to be read by humans.
 
 You must set a limit, as unlimited file sizes aren't supported. Setting this
-value to be greater than the amount of memory on GitLab's Sidekiq nodes causes
-GitLab's Sidekiq nodes to run out of memory, as they will pre-allocate this
+value to be greater than the amount of memory on GitLab Sidekiq nodes causes
+the GitLab Sidekiq nodes to run out of memory, as they will pre-allocate this
 amount of memory during indexing.
 
 ### Maximum field length
diff --git a/doc/administration/nfs.md b/doc/administration/nfs.md
index ccf3aa59f7b..1e2ac531329 100644
--- a/doc/administration/nfs.md
+++ b/doc/administration/nfs.md
@@ -370,7 +370,7 @@ GitLab strongly recommends against using AWS Elastic File System (EFS).
 Our support team will not be able to assist on performance issues related to
 file system access.
 
-Customers and users have reported that AWS EFS does not perform well for GitLab's
+Customers and users have reported that AWS EFS does not perform well for the GitLab
 use-case. Workloads where many small files are written in a serialized manner, like `git`,
 are not well-suited for EFS. EBS with an NFS server on top will perform much better.
 
@@ -383,7 +383,7 @@ For more details on another person's experience with EFS, see this [Commit Brook
 ### Avoid using CephFS and GlusterFS
 
 GitLab strongly recommends against using CephFS and GlusterFS.
-These distributed file systems are not well-suited for GitLab's input/output access patterns because Git uses many small files and access times and file locking times to propagate will make Git activity very slow.
+These distributed file systems are not well-suited for the GitLab input/output access patterns because Git uses many small files and access times and file locking times to propagate will make Git activity very slow.
 
 ### Avoid using PostgreSQL with NFS
 
diff --git a/doc/administration/operations/ssh_certificates.md b/doc/administration/operations/ssh_certificates.md
index 79bccc6f27a..6671e9a9d54 100644
--- a/doc/administration/operations/ssh_certificates.md
+++ b/doc/administration/operations/ssh_certificates.md
@@ -9,12 +9,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > [Available in](https://gitlab.com/gitlab-org/gitlab-foss/-/merge_requests/19911) GitLab
 > Community Edition 11.2.
 
-GitLab's default SSH authentication requires users to upload their SSH
+The default SSH authentication for GitLab requires users to upload their SSH
 public keys before they can use the SSH transport.
 
-In centralized (e.g. corporate) environments this can be a hassle
-operationally, particularly if the SSH keys are temporary keys issued
-to the user, e.g. ones that expire 24 hours after issuing.
+In centralized (for example, corporate) environments this can be a hassle
+operationally, particularly if the SSH keys are temporary keys issued to the
+user, including ones that expire 24 hours after issuing.
 
 In such setups some external automated process is needed to constantly
 upload the new keys to GitLab.
diff --git a/doc/administration/pages/index.md b/doc/administration/pages/index.md
index 2dee9639cce..af0476b72e9 100644
--- a/doc/administration/pages/index.md
+++ b/doc/administration/pages/index.md
@@ -53,7 +53,7 @@ supporting custom domains a secondary IP is not needed.
 
 Before proceeding with the Pages configuration, you will need to:
 
-1. Have a domain for Pages that is not a subdomain of your GitLab's instance domain.
+1. Have a domain for Pages that is not a subdomain of your GitLab instance domain.
 
    | GitLab domain | Pages domain | Does it work? |
    | :---: | :---: | :---: |
@@ -842,7 +842,7 @@ x509: certificate signed by unknown authority
 ```
 
 The reason for those errors is that the files `resolv.conf` and `ca-bundle.pem` are missing inside the chroot.
-The fix is to copy the host's `/etc/resolv.conf` and GitLab's certificate bundle inside the chroot:
+The fix is to copy the host's `/etc/resolv.conf` and the GitLab certificate bundle inside the chroot:
 
 ```shell
 sudo mkdir -p /var/opt/gitlab/gitlab-rails/shared/pages/etc/ssl
diff --git a/doc/administration/pseudonymizer.md b/doc/administration/pseudonymizer.md
index 36442c5115f..5f1272b1f4a 100644
--- a/doc/administration/pseudonymizer.md
+++ b/doc/administration/pseudonymizer.md
@@ -8,9 +8,9 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/5532) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 11.1.
 
-As GitLab's database hosts sensitive information, using it unfiltered for analytics
+As the GitLab database hosts sensitive information, using it unfiltered for analytics
 implies high security requirements. To help alleviate this constraint, the Pseudonymizer
-service is used to export GitLab's data in a pseudonymized way.
+service is used to export GitLab data in a pseudonymized way.
 
 WARNING:
 This process is not impervious. If the source data is available, it's possible for
diff --git a/doc/administration/raketasks/uploads/migrate.md b/doc/administration/raketasks/uploads/migrate.md
index 29a5cf82b97..2f51bf9357f 100644
--- a/doc/administration/raketasks/uploads/migrate.md
+++ b/doc/administration/raketasks/uploads/migrate.md
@@ -13,8 +13,8 @@ There is a Rake task for migrating uploads between different storage types.
 
 ## Migrate to object storage
 
-After [configuring the object storage](../../uploads.md#using-object-storage) for GitLab's
-uploads, use this task to migrate existing uploads from the local storage to the remote storage.
+After [configuring the object storage](../../uploads.md#using-object-storage) for uploads
+to GitLab, use this task to migrate existing uploads from the local storage to the remote storage.
 
 All of the processing is done in a background worker and requires **no downtime**.
 
@@ -56,7 +56,7 @@ The Rake task uses three parameters to find uploads to migrate:
 | `mount_point`    | string/symbol | Name of the model's column the uploader is mounted on. |
 
 NOTE:
-These parameters are mainly internal to GitLab's structure, you may want to refer to the task list
+These parameters are mainly internal to the structure of GitLab, you may want to refer to the task list
 instead below.
 
 This task also accepts an environment variable which you can use to override
diff --git a/doc/administration/reference_architectures/10k_users.md b/doc/administration/reference_architectures/10k_users.md
index caa0c059220..e707d8f1ee8 100644
--- a/doc/administration/reference_architectures/10k_users.md
+++ b/doc/administration/reference_architectures/10k_users.md
@@ -1763,12 +1763,6 @@ You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_proces
 
 This section describes how to configure the GitLab application (Rails) component.
 
-In our architecture, we run each GitLab Rails node using the Puma webserver, and
-have its number of workers set to 90% of available CPUs, with four threads. For
-nodes running Rails with other components, the worker value should be reduced
-accordingly. We've determined that a worker value of 50% achieves a good balance,
-but this is dependent on workload.
-
 The following IPs will be used as an example:
 
 - `10.6.0.111`: GitLab application 1
diff --git a/doc/administration/reference_architectures/25k_users.md b/doc/administration/reference_architectures/25k_users.md
index 6245f884371..b28c8b1242b 100644
--- a/doc/administration/reference_architectures/25k_users.md
+++ b/doc/administration/reference_architectures/25k_users.md
@@ -1763,12 +1763,6 @@ You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_proces
 
 This section describes how to configure the GitLab application (Rails) component.
 
-In our architecture, we run each GitLab Rails node using the Puma webserver, and
-have its number of workers set to 90% of available CPUs, with four threads. For
-nodes running Rails with other components, the worker value should be reduced
-accordingly. We've determined that a worker value of 50% achieves a good balance,
-but this is dependent on workload.
-
 The following IPs will be used as an example:
 
 - `10.6.0.111`: GitLab application 1
diff --git a/doc/administration/reference_architectures/3k_users.md b/doc/administration/reference_architectures/3k_users.md
index 2d57f0b0317..fad81c4e340 100644
--- a/doc/administration/reference_architectures/3k_users.md
+++ b/doc/administration/reference_architectures/3k_users.md
@@ -1479,12 +1479,6 @@ You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_proces
 
 This section describes how to configure the GitLab application (Rails) component.
 
-In our architecture, we run each GitLab Rails node using the Puma webserver, and
-have its number of workers set to 90% of available CPUs, with four threads. For
-nodes running Rails with other components, the worker value should be reduced
-accordingly. We've determined that a worker value of 50% achieves a good balance,
-but this is dependent on workload.
-
 On each node perform the following:
 
 1. If you're [using NFS](#configure-nfs-optional):
diff --git a/doc/administration/reference_architectures/50k_users.md b/doc/administration/reference_architectures/50k_users.md
index 3c0fefe2430..2cfea48472c 100644
--- a/doc/administration/reference_architectures/50k_users.md
+++ b/doc/administration/reference_architectures/50k_users.md
@@ -1763,12 +1763,6 @@ You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_proces
 
 This section describes how to configure the GitLab application (Rails) component.
 
-In our architecture, we run each GitLab Rails node using the Puma webserver, and
-have its number of workers set to 90% of available CPUs, with four threads. For
-nodes running Rails with other components, the worker value should be reduced
-accordingly. We've determined that a worker value of 50% achieves a good balance,
-but this is dependent on workload.
-
 The following IPs will be used as an example:
 
 - `10.6.0.111`: GitLab application 1
diff --git a/doc/administration/reference_architectures/5k_users.md b/doc/administration/reference_architectures/5k_users.md
index 936f7b8f243..5c615d98425 100644
--- a/doc/administration/reference_architectures/5k_users.md
+++ b/doc/administration/reference_architectures/5k_users.md
@@ -1479,12 +1479,6 @@ You can also run [multiple Sidekiq processes](../operations/extra_sidekiq_proces
 
 This section describes how to configure the GitLab application (Rails) component.
 
-In our architecture, we run each GitLab Rails node using the Puma webserver, and
-have its number of workers set to 90% of available CPUs, with four threads. For
-nodes running Rails with other components, the worker value should be reduced
-accordingly. We've determined that a worker value of 50% achieves a good balance,
-but this is dependent on workload.
-
 On each node perform the following:
 
 1. If you're [using NFS](#configure-nfs-optional):
diff --git a/doc/administration/reference_architectures/index.md b/doc/administration/reference_architectures/index.md
index f269febf182..6b04dad9baf 100644
--- a/doc/administration/reference_architectures/index.md
+++ b/doc/administration/reference_architectures/index.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 You can set up GitLab on a single server or scale it up to serve many users.
 This page details the recommended Reference Architectures that were built and
-verified by GitLab's Quality and Support teams.
+verified by the GitLab Quality and Support teams.
 
 Below is a chart representing each architecture tier and the number of users
 they can handle. As your number of users grow with time, it’s recommended that
@@ -18,8 +18,8 @@ you scale GitLab accordingly.
 ![Reference Architectures](img/reference-architectures.png)
 <!-- Internal link: https://docs.google.com/spreadsheets/d/1obYP4fLKkVVDOljaI3-ozhmCiPtEeMblbBKkf2OADKs/edit#gid=1403207183 -->
 
-Testing on these reference architectures were performed with
-[GitLab's Performance Tool](https://gitlab.com/gitlab-org/quality/performance)
+Testing on these reference architectures was performed with the
+[GitLab Performance Tool](https://gitlab.com/gitlab-org/quality/performance)
 at specific coded workloads, and the throughputs used for testing were
 calculated based on sample customer data. Select the
 [reference architecture](#available-reference-architectures) that matches your scale.
@@ -36,8 +36,8 @@ the [default setup](#automated-backups) by
 [installing GitLab](../../install/README.md) on a single machine to minimize
 maintenance and resource costs.
 
-If your organization has more than 2,000 users, the recommendation is to scale
-GitLab's components to multiple machine nodes. The machine nodes are grouped by
+If your organization has more than 2,000 users, the recommendation is to scale the
+GitLab components to multiple machine nodes. The machine nodes are grouped by
 components. The addition of these nodes increases the performance and
 scalability of to your GitLab instance.
 
diff --git a/doc/api/discussions.md b/doc/api/discussions.md
index 228b21617d8..51ca2bea3ae 100644
--- a/doc/api/discussions.md
+++ b/doc/api/discussions.md
@@ -773,6 +773,7 @@ Diff comments also contain position:
         "noteable_id": 3,
         "noteable_type": "Merge request",
         "noteable_iid": null,
+        "commit_id": "4803c71e6b1833ca72b8b26ef2ecd5adc8a38031",
         "position": {
           "base_sha": "b5d6e7b1613fca24d250fa8e5bc7bcc3dd6002ef",
           "start_sha": "7c9c2ead8a320fb7ba0b4e234bd9529a2614e306",
@@ -828,6 +829,8 @@ curl --header "PRIVATE-TOKEN: <your_access_token>" "https://gitlab.example.com/a
 
 ### Create new merge request thread
 
+> The `commit id` entry was [introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/47130) in GitLab 13.7.
+
 Creates a new thread to a single project merge request. This is similar to creating
 a note but other comments (replies) can be added to it later.
 
@@ -842,6 +845,7 @@ Parameters:
 | `id`                                     | integer/string | yes      | The ID or [URL-encoded path of the project](README.md#namespaced-path-encoding) |
 | `merge_request_iid`                      | integer        | yes      | The IID of a merge request |
 | `body`                                   | string         | yes      | The content of the thread |
+| `commit_id`                              | string         | no       | SHA referencing commit to start this thread on |
 | `created_at`                             | string         | no       | Date time string, ISO 8601 formatted, e.g. 2016-03-11T03:45:40Z (requires admin or project/group owner rights) |
 | `position`                               | hash           | no       | Position when creating a diff note |
 | `position[base_sha]`                     | string         | yes      | Base commit SHA in the source branch |
diff --git a/doc/api/freeze_periods.md b/doc/api/freeze_periods.md
index a4f6b03964f..50f1fe9f12b 100644
--- a/doc/api/freeze_periods.md
+++ b/doc/api/freeze_periods.md
@@ -9,7 +9,7 @@ type: concepts, howto
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/29382) in GitLab 13.0.
 
-You can use the Freeze Periods API to manipulate GitLab's [Freeze Period](../user/project/releases/index.md#prevent-unintentional-releases-by-setting-a-deploy-freeze) entries.
+You can use the Freeze Periods API to manipulate GitLab [Freeze Period](../user/project/releases/index.md#prevent-unintentional-releases-by-setting-a-deploy-freeze) entries.
 
 ## Permissions and security
 
diff --git a/doc/api/releases/index.md b/doc/api/releases/index.md
index af89cd206a7..0cb11a2b586 100644
--- a/doc/api/releases/index.md
+++ b/doc/api/releases/index.md
@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Releases API
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41766) in GitLab 11.7.
-> - Using this API you can manipulate GitLab's [Release](../../user/project/releases/index.md) entries.
+> - Using this API you can manipulate GitLab [Release](../../user/project/releases/index.md) entries.
 > - For manipulating links as a release asset, see [Release Links API](links.md).
 > - Release Evidences were [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/26019) in GitLab 12.5.
 
diff --git a/doc/api/releases/links.md b/doc/api/releases/links.md
index 5c2be34d201..88ce3f6ccb4 100644
--- a/doc/api/releases/links.md
+++ b/doc/api/releases/links.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/41766) in GitLab 11.7.
 
-Using this API you can manipulate GitLab's [Release](../../user/project/releases/index.md) links. For manipulating other Release assets, see [Release API](index.md).
+Using this API you can manipulate GitLab [Release](../../user/project/releases/index.md) links. For manipulating other Release assets, see [Release API](index.md).
 GitLab supports links to `http`, `https`, and `ftp` assets.
 
 ## Get links
diff --git a/doc/ci/README.md b/doc/ci/README.md
index e18e540ee4f..20234052808 100644
--- a/doc/ci/README.md
+++ b/doc/ci/README.md
@@ -19,7 +19,7 @@ through the [continuous methodologies](introduction/index.md#introduction-to-cic
 NOTE:
 Out-of-the-box management systems can decrease hours spent on maintaining toolchains by 10% or more.
 Watch our ["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
-webcast to learn about continuous methods and how GitLab’s built-in CI can help you simplify and scale software development.
+webcast to learn about continuous methods and how the GitLab built-in CI can help you simplify and scale software development.
 
 ## Overview
 
diff --git a/doc/ci/cloud_deployment/index.md b/doc/ci/cloud_deployment/index.md
index acb4d36866c..4706180688a 100644
--- a/doc/ci/cloud_deployment/index.md
+++ b/doc/ci/cloud_deployment/index.md
@@ -25,9 +25,9 @@ it easier to [deploy to AWS](#deploy-your-application-to-the-aws-elastic-contain
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/31167) in GitLab 12.6.
 
-GitLab's AWS Docker image provides the [AWS Command Line Interface](https://aws.amazon.com/cli/),
+The GitLab AWS Docker image provides the [AWS Command Line Interface](https://aws.amazon.com/cli/),
 which enables you to run `aws` commands. As part of your deployment strategy, you can run `aws` commands directly from
-`.gitlab-ci.yml` by specifying [GitLab's AWS Docker image](https://gitlab.com/gitlab-org/cloud-deploy).
+`.gitlab-ci.yml` by specifying the [GitLab AWS Docker image](https://gitlab.com/gitlab-org/cloud-deploy).
 
 Some credentials are required to be able to run `aws` commands:
 
diff --git a/doc/ci/environments/index.md b/doc/ci/environments/index.md
index 77f2e1f653b..c755a954164 100644
--- a/doc/ci/environments/index.md
+++ b/doc/ci/environments/index.md
@@ -279,7 +279,7 @@ deploy_prod:
 
 The `when: manual` action:
 
-- Exposes a "play" button in GitLab's UI for that job.
+- Exposes a "play" button in the GitLab UI for that job.
 - Means the `deploy_prod` job will only be triggered when the "play" button is clicked.
 
 You can find the "play" button in the pipelines, environments, deployments, and jobs views.
@@ -413,7 +413,7 @@ deploy:
     - master
 ```
 
-When deploying to a Kubernetes cluster using GitLab's Kubernetes integration,
+When deploying to a Kubernetes cluster using the GitLab Kubernetes integration,
 information about the cluster and namespace will be displayed above the job
 trace on the deployment job page:
 
@@ -648,7 +648,7 @@ For example:
 
 #### Going from source files to public pages
 
-With GitLab's [Route Maps](../review_apps/index.md#route-maps) you can go directly
+With GitLab [Route Maps](../review_apps/index.md#route-maps), you can go directly
 from source files to public pages in the environment set for Review Apps.
 
 ### Stopping an environment
diff --git a/doc/ci/introduction/index.md b/doc/ci/introduction/index.md
index 1447c3d5730..fa5c8c9a606 100644
--- a/doc/ci/introduction/index.md
+++ b/doc/ci/introduction/index.md
@@ -15,7 +15,7 @@ GitLab CI/CD.
 NOTE:
 Out-of-the-box management systems can decrease hours spent on maintaining toolchains by 10% or more.
 Watch our ["Mastering continuous software development"](https://about.gitlab.com/webcast/mastering-ci-cd/)
-webcast to learn about continuous methods and how GitLab’s built-in CI can help you simplify and scale software development.
+webcast to learn about continuous methods and how the GitLab built-in CI can help you simplify and scale software development.
 
 > For some additional information about GitLab CI/CD:
 >
diff --git a/doc/ci/review_apps/index.md b/doc/ci/review_apps/index.md
index a48a55e49de..31fcfe9d6e8 100644
--- a/doc/ci/review_apps/index.md
+++ b/doc/ci/review_apps/index.md
@@ -125,7 +125,7 @@ paths (on the website).
 ### Route Maps example
 
 The following is an example of a route map for [Middleman](https://middlemanapp.com),
-a static site generator (SSG) used to build [GitLab's website](https://about.gitlab.com),
+a static site generator (SSG) used to build the [GitLab website](https://about.gitlab.com),
 deployed from its [project on GitLab.com](https://gitlab.com/gitlab-com/www-gitlab-com):
 
 ```yaml
diff --git a/doc/development/build_test_package.md b/doc/development/build_test_package.md
index ab90fdc0632..421ee5d0c84 100644
--- a/doc/development/build_test_package.md
+++ b/doc/development/build_test_package.md
@@ -13,7 +13,7 @@ pipeline that can be used to trigger a pipeline in the Omnibus GitLab repository
 that will create:
 
 - A deb package for Ubuntu 16.04, available as a build artifact, and
-- A Docker image, which is pushed to [Omnibus GitLab's container
+- A Docker image, which is pushed to the [Omnibus GitLab container
   registry](https://gitlab.com/gitlab-org/omnibus-gitlab/container_registry)
   (images titled `gitlab-ce` and `gitlab-ee` respectively and image tag is the
   commit which triggered the pipeline).
diff --git a/doc/development/documentation/styleguide/index.md b/doc/development/documentation/styleguide/index.md
index 84df0f82a3e..971652f76d3 100644
--- a/doc/development/documentation/styleguide/index.md
+++ b/doc/development/documentation/styleguide/index.md
@@ -528,6 +528,7 @@ You can use the following fake tokens as examples:
 
 | Usage | Guidance |
 |-----------------------|-----|
+| admin, admin area     | Use **administration**, **administrator**, **administer**, or **Admin Area** instead. |.
 | and/or                | Use **or** instead, or another sensible construction. |
 | currently             | Do not use when talking about the product or its features. The documentation describes the product as it is today. |
 | easily                | Do not use. If the user doesn't find the process to be these things, we lose their trust. |
@@ -539,7 +540,7 @@ You can use the following fake tokens as examples:
 | i.e.                  | Do not use Latin abbreviations. Use **that is** instead. ([Vale](../testing.md#vale) rule: [`LatinTerms.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/LatinTerms.yml)) |
 | jargon                | Do not use. Define the term or [link to a definition](#links-to-external-documentation). |
 | may, might            | **Might** means something has the probability of occurring. **May** gives permission to do something. Consider **can** instead of **may**. |
-| me                    | Do not use first-person singular. Use **you**, **we**, or **us** instead. ([Vale](../testing.md#vale) rule: [`FirstPerson.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/FirstPerson.yml)) |
+| me, myself, mine      | Do not use first-person singular. Use **you**, **we**, or **us** instead. ([Vale](../testing.md#vale) rule: [`FirstPerson.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/FirstPerson.yml)) |
 | please                | Do not use. For details, see the [Microsoft style guide](https://docs.microsoft.com/en-us/style-guide/a-z-word-list-term-collections/p/please). |
 | profanity             | Do not use. Doing so may negatively affect other users and contributors, which is contrary to the GitLab value of [Diversity, Inclusion, and Belonging](https://about.gitlab.com/handbook/values/#diversity-inclusion). |
 | scalability           | Do not use when talking about increasing GitLab performance for additional users. The words scale or scaling are sometimes acceptable, but references to increasing GitLab performance for additional users should direct readers to the GitLab [reference architectures](../../../administration/reference_architectures/index.md) page. |
@@ -547,6 +548,7 @@ You can use the following fake tokens as examples:
 | slashes               | Instead of **and/or**, use **or** or another sensible construction. This rule also applies to other slashes, like **follow/unfollow**. Some exceptions (like **CI/CD**) are allowed. |
 | that                  | Do not use. Example: `the file that you save` can be `the file you save`. |
 | useful                | Do not use. If the user doesn't find the process to be these things, we lose their trust. |
+| utilize               | Do not use. Use **use** instead. It's more succinct and easier for non-native English speakers to understand. |
 | via                   | Do not use Latin abbreviations. Use **with**, **through**, or **by using** instead. ([Vale](../testing.md#vale) rule: [`LatinTerms.yml`](https://gitlab.com/gitlab-org/gitlab/-/blob/master/doc/.vale/gitlab/LatinTerms.yml)) |
 
 <!-- vale on -->
@@ -1853,7 +1855,8 @@ packages. Possible configuration settings include:
 - Other settings in `lib/support/`.
 
 Configuration procedures can require users to edit configuration files, reconfigure
-GitLab, or restart GitLab. Use these styles to document these steps:
+GitLab, or restart GitLab. Use these styles to document these steps, replacing
+`PATH/TO` with the appropriate path:
 
 <!-- vale off -->
 
@@ -1866,7 +1869,7 @@ GitLab, or restart GitLab. Use these styles to document these steps:
    external_url "https://gitlab.example.com"
    ```
 
-1. Save the file and [reconfigure](path/to/administration/restart_gitlab.md#omnibus-gitlab-reconfigure)
+1. Save the file and [reconfigure](PATH/TO/administration/restart_gitlab.md#omnibus-gitlab-reconfigure)
    GitLab for the changes to take effect.
 
 ---
@@ -1880,7 +1883,7 @@ GitLab, or restart GitLab. Use these styles to document these steps:
      host: "gitlab.example.com"
    ```
 
-1. Save the file and [restart](path/to/administration/restart_gitlab.md#installations-from-source)
+1. Save the file and [restart](PATH/TO/administration/restart_gitlab.md#installations-from-source)
    GitLab for the changes to take effect.
 ````
 
diff --git a/doc/development/documentation/testing.md b/doc/development/documentation/testing.md
index 1819af04609..d2e3f473532 100644
--- a/doc/development/documentation/testing.md
+++ b/doc/development/documentation/testing.md
@@ -192,7 +192,7 @@ You can use Vale:
 - [In a Git hook](#configure-pre-push-hooks). Vale only reports errors in the Git hook (the same
   configuration as the CI/CD pipelines), and does not report suggestions or warnings.
 
-#### Vale
+#### Vale result types
 
 Vale returns three types of results: `suggestion`, `warning`, and `error`:
 
diff --git a/doc/development/elasticsearch.md b/doc/development/elasticsearch.md
index 60d0d682e3e..1c92601dde9 100644
--- a/doc/development/elasticsearch.md
+++ b/doc/development/elasticsearch.md
@@ -13,9 +13,9 @@ the [Elasticsearch integration documentation](../integration/elasticsearch.md#en
 
 ## Deep Dive
 
-In June 2019, Mario de la Ossa hosted a Deep Dive (GitLab team members only: `https://gitlab.com/gitlab-org/create-stage/issues/1`) on GitLab's [Elasticsearch integration](../integration/elasticsearch.md) to share his domain specific knowledge with anyone who may work in this part of the codebase in the future. You can find the [recording on YouTube](https://www.youtube.com/watch?v=vrvl-tN2EaA), and the slides on [Google Slides](https://docs.google.com/presentation/d/1H-pCzI_LNrgrL5pJAIQgvLX8Ji0-jIKOg1QeJQzChug/edit) and in [PDF](https://gitlab.com/gitlab-org/create-stage/uploads/c5aa32b6b07476fa8b597004899ec538/Elasticsearch_Deep_Dive.pdf). Everything covered in this deep dive was accurate as of GitLab 12.0, and while specific details may have changed since then, it should still serve as a good introduction.
+In June 2019, Mario de la Ossa hosted a Deep Dive (GitLab team members only: `https://gitlab.com/gitlab-org/create-stage/issues/1`) on the GitLab [Elasticsearch integration](../integration/elasticsearch.md) to share his domain specific knowledge with anyone who may work in this part of the codebase in the future. You can find the [recording on YouTube](https://www.youtube.com/watch?v=vrvl-tN2EaA), and the slides on [Google Slides](https://docs.google.com/presentation/d/1H-pCzI_LNrgrL5pJAIQgvLX8Ji0-jIKOg1QeJQzChug/edit) and in [PDF](https://gitlab.com/gitlab-org/create-stage/uploads/c5aa32b6b07476fa8b597004899ec538/Elasticsearch_Deep_Dive.pdf). Everything covered in this deep dive was accurate as of GitLab 12.0, and while specific details may have changed since then, it should still serve as a good introduction.
 
-In August 2020, a second Deep Dive was hosted, focusing on [GitLab's specific architecture for multi-indices support](#zero-downtime-reindexing-with-multiple-indices). The [recording on YouTube](https://www.youtube.com/watch?v=0WdPR9oB2fg) and the [slides](https://lulalala.gitlab.io/gitlab-elasticsearch-deepdive/) are available. Everything covered in this deep dive was accurate as of GitLab 13.3.
+In August 2020, a second Deep Dive was hosted, focusing on [GitLab-specific architecture for multi-indices support](#zero-downtime-reindexing-with-multiple-indices). The [recording on YouTube](https://www.youtube.com/watch?v=0WdPR9oB2fg) and the [slides](https://lulalala.gitlab.io/gitlab-elasticsearch-deepdive/) are available. Everything covered in this deep dive was accurate as of GitLab 13.3.
 
 ## Supported Versions
 
@@ -173,7 +173,7 @@ This is not applicable yet as multiple indices functionality is not fully implem
 
 Folders like `ee/lib/elastic/v12p1` contain snapshots of search logic from different versions. To keep a continuous Git history, the latest version lives under `ee/lib/elastic/latest`, but its classes are aliased under an actual version (e.g. `ee/lib/elastic/v12p3`). When referencing these classes, never use the `Latest` namespace directly, but use the actual version (e.g. `V12p3`).
 
-The version name basically follows GitLab's release version. If setting is changed in 12.3, we will create a new namespace called `V12p3` (p stands for "point"). Raise an issue if there is a need to name a version differently.
+The version name basically follows the GitLab release version. If setting is changed in 12.3, we will create a new namespace called `V12p3` (p stands for "point"). Raise an issue if there is a need to name a version differently.
 
 If the current version is `v12p1`, and we need to create a new version for `v12p3`, the steps are as follows:
 
diff --git a/doc/development/i18n/index.md b/doc/development/i18n/index.md
index eb435dd5ac0..b0e34052d2a 100644
--- a/doc/development/i18n/index.md
+++ b/doc/development/i18n/index.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Translate GitLab to your language
 
-The text in GitLab's user interface is in American English by default.
+The text in the GitLab user interface is in American English by default.
 Each string can be translated to other languages.
 As each string is translated, it is added to the languages translation file,
 and is made available in future releases of GitLab.
diff --git a/doc/development/i18n/translation.md b/doc/development/i18n/translation.md
index b5839926e25..25dc854d2a3 100644
--- a/doc/development/i18n/translation.md
+++ b/doc/development/i18n/translation.md
@@ -79,7 +79,7 @@ determining a suitable level of formality.
 
 ### Inclusive language
 
-[Diversity](https://about.gitlab.com/handbook/values/#diversity) is one of GitLab's values.
+[Diversity](https://about.gitlab.com/handbook/values/#diversity) is a GitLab value.
 We ask you to avoid translations which exclude people based on their gender or
 ethnicity.
 In languages which distinguish between a male and female form, use both or
diff --git a/doc/development/image_scaling.md b/doc/development/image_scaling.md
index ad2c33f0375..d447b6baf57 100644
--- a/doc/development/image_scaling.md
+++ b/doc/development/image_scaling.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Image scaling guide
 
-This section contains a brief overview of GitLab's image scaler and how to work with it.
+This section contains a brief overview of the GitLab image scaler and how to work with it.
 
 For a general introduction to the history of image scaling at GitLab, you might be interested in
 [this Unfiltered blog post](https://about.gitlab.com/blog/2020/11/02/scaling-down-how-we-prototyped-an-image-scaler-at-gitlab/).
diff --git a/doc/development/integrations/secure_partner_integration.md b/doc/development/integrations/secure_partner_integration.md
index 4cd2cb016b6..c43eb2b4570 100644
--- a/doc/development/integrations/secure_partner_integration.md
+++ b/doc/development/integrations/secure_partner_integration.md
@@ -19,7 +19,7 @@ integration as well as linking to more detailed resources for how to do so.
 
 ## Integration Tiers
 
-GitLab's security offerings are designed for GitLab Gold and GitLab Ultimate users, and the
+The security offerings in GitLab are designed for GitLab Gold and GitLab Ultimate users, and the
 [DevSecOps](https://about.gitlab.com/handbook/use-cases/#4-devsecops-shift-left-security)
 use case. All the features are in those tiers. This includes the APIs and standard reporting
 framework needed to provide a consistent experience for users to easily bring their preferred
diff --git a/doc/install/README.md b/doc/install/README.md
index ed67a1d09a2..f0aee9b6927 100644
--- a/doc/install/README.md
+++ b/doc/install/README.md
@@ -93,7 +93,7 @@ the above methods, provided the cloud provider supports it.
 - [Install on AWS](aws/index.md): Install Omnibus GitLab on AWS using the community AMIs that GitLab provides.
 - [Install GitLab on Google Cloud Platform](google_cloud_platform/index.md): Install Omnibus GitLab on a VM in GCP.
 - [Install GitLab on Azure](azure/index.md): Install Omnibus GitLab from Azure Marketplace.
-- [Install GitLab on OpenShift](https://docs.gitlab.com/charts/installation/cloud/openshift.html): Install GitLab on OpenShift by using GitLab's Helm charts.
+- [Install GitLab on OpenShift](https://docs.gitlab.com/charts/installation/cloud/openshift.html): Install GitLab on OpenShift by using the GitLab Helm charts.
 - [Install GitLab on DC/OS](https://d2iq.com/blog/gitlab-dcos): Install GitLab on Mesosphere DC/OS via the [GitLab-Mesosphere integration](https://about.gitlab.com/blog/2016/09/16/announcing-gitlab-and-mesosphere/).
 - [Install GitLab on DigitalOcean](https://about.gitlab.com/blog/2016/04/27/getting-started-with-gitlab-and-digitalocean/): Install Omnibus GitLab on DigitalOcean.
 - _Testing only!_ [DigitalOcean and Docker Machine](digitaloceandocker.md):
@@ -107,7 +107,7 @@ installation:
 - [Upload a license](../user/admin_area/license.md)  or [start a free trial](https://about.gitlab.com/free-trial/):
   Activate all GitLab Enterprise Edition functionality with a license.
 - [Set up runners](https://docs.gitlab.com/runner/): Set up one or more GitLab
-  Runners, the agents that are responsible for all of GitLab's CI/CD features.
+  Runners, the agents that are responsible for all of the GitLab CI/CD features.
 - [GitLab Pages](../administration/pages/index.md): Configure GitLab Pages to
   allow hosting of static sites.
 - [GitLab Registry](../administration/packages/container_registry.md): With the
@@ -129,7 +129,7 @@ installation:
   faster, more advanced code search across your entire GitLab instance.
 - [Geo replication](../administration/geo/index.md):
   Geo is the solution for widely distributed development teams.
-- [Release and maintenance policy](../policy/maintenance.md): Learn about GitLab's
+- [Release and maintenance policy](../policy/maintenance.md): Learn about GitLab
   policies governing version naming, as well as release pace for major, minor, patch,
   and security releases.
 - [Pricing](https://about.gitlab.com/pricing/): Pricing for the different tiers.
diff --git a/doc/install/aws/index.md b/doc/install/aws/index.md
index 54a1c831fa2..28f04c1a7a7 100644
--- a/doc/install/aws/index.md
+++ b/doc/install/aws/index.md
@@ -470,7 +470,7 @@ Connect to your GitLab instance via **Bastion Host A** using [SSH Agent Forwardi
 
 #### Disable Let's Encrypt
 
-Since we're adding our SSL certificate at the load balancer, we do not need GitLab's built-in support for Let's Encrypt. Let's Encrypt [is enabled by default](https://docs.gitlab.com/omnibus/settings/ssl.html#lets-encrypt-integration) when using an `https` domain in GitLab 10.7 and later, so we need to explicitly disable it:
+Since we're adding our SSL certificate at the load balancer, we do not need the GitLab built-in support for Let's Encrypt. Let's Encrypt [is enabled by default](https://docs.gitlab.com/omnibus/settings/ssl.html#lets-encrypt-integration) when using an `https` domain in GitLab 10.7 and later, so we need to explicitly disable it:
 
 1. Open `/etc/gitlab/gitlab.rb` and disable it:
 
@@ -586,7 +586,7 @@ Let's create an EC2 instance where we'll install Gitaly:
 1. Finally, acknowledge that you have access to the selected private key file or create a new one. Click **Launch Instances**.
 
 NOTE:
-Instead of storing configuration _and_ repository data on the root volume, you can also choose to add an additional EBS volume for repository storage. Follow the same guidance as above. See the [Amazon EBS pricing](https://aws.amazon.com/ebs/pricing/). We do not recommend using EFS as it may negatively impact GitLab’s performance. You can review the [relevant documentation](../../administration/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
+Instead of storing configuration _and_ repository data on the root volume, you can also choose to add an additional EBS volume for repository storage. Follow the same guidance as above. See the [Amazon EBS pricing](https://aws.amazon.com/ebs/pricing/). We do not recommend using EFS as it may negatively impact the performance of GitLab. You can review the [relevant documentation](../../administration/nfs.md#avoid-using-awss-elastic-file-system-efs) for more details.
 
 Now that we have our EC2 instance ready, follow the [documentation to install GitLab and set up Gitaly on its own server](../../administration/gitaly/index.md#run-gitaly-on-its-own-server). Perform the client setup steps from that document on the [GitLab instance we created](#install-gitlab) above.
 
diff --git a/doc/install/azure/index.md b/doc/install/azure/index.md
index 7a50052d937..15906bc056f 100644
--- a/doc/install/azure/index.md
+++ b/doc/install/azure/index.md
@@ -9,7 +9,7 @@ type: howto
 # Install GitLab on Microsoft Azure
 
 WARNING:
-This guide is deprecated and pending an update. For the time being, use GitLab's
+This guide is deprecated and pending an update. For the time being, use the GitLab
 [image in the Azure Marketplace](https://azuremarketplace.microsoft.com/en-us/marketplace/apps/gitlabinc1586447921813.gitlabee?tab=Overview).
 
 Azure is Microsoft's business cloud and GitLab is a pre-configured offering on
diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md
index fa1d4276d8c..21fe87a71b1 100644
--- a/doc/install/openshift_and_gitlab/index.md
+++ b/doc/install/openshift_and_gitlab/index.md
@@ -19,7 +19,7 @@ for details.
 platform created by [RedHat](https://www.redhat.com/en), based on [Kubernetes](https://kubernetes.io/) and [Docker](https://www.docker.com). That means
 you can host your own PaaS for free and almost with no hassle.
 
-In this tutorial, we will see how to deploy GitLab in OpenShift using GitLab's
+In this tutorial, we will see how to deploy GitLab in OpenShift using the GitLab
 official Docker image while getting familiar with the web interface and CLI
 tools that will help us achieve our goal.
 
@@ -326,8 +326,8 @@ Now that we configured this, let's see how to manage and scale GitLab.
 
 Setting up GitLab for the first time might take a while depending on your
 internet connection and the resources you have attached to the all-in-one VM.
-GitLab's Docker image is quite big (~500MB), so you'll have to wait until
-it's downloaded and configured before you use it.
+The GitLab Docker image is quite big (approximately 500 MB), so you'll have to
+wait until it's downloaded and configured before you use it.
 
 ### Watch while GitLab gets deployed
 
diff --git a/doc/install/requirements.md b/doc/install/requirements.md
index f495b7114ee..cced6d0a3f6 100644
--- a/doc/install/requirements.md
+++ b/doc/install/requirements.md
@@ -107,7 +107,7 @@ Apart from a local hard drive you can also mount a volume that supports the netw
 If you have enough RAM and a recent CPU the speed of GitLab is mainly limited by hard drive seek times. Having a fast drive (7200 RPM and up) or a solid state drive (SSD) will improve the responsiveness of GitLab.
 
 NOTE:
-Since file system performance may affect GitLab's overall performance, [we don't recommend using AWS EFS for storage](../administration/nfs.md#avoid-using-awss-elastic-file-system-efs).
+Since file system performance may affect the overall performance of GitLab, [we don't recommend using AWS EFS for storage](../administration/nfs.md#avoid-using-awss-elastic-file-system-efs).
 
 ### CPU
 
diff --git a/doc/integration/elasticsearch.md b/doc/integration/elasticsearch.md
index 698d6e9c38c..52275649a67 100644
--- a/doc/integration/elasticsearch.md
+++ b/doc/integration/elasticsearch.md
@@ -85,7 +85,7 @@ updated automatically.
 
 ## Upgrading to a new Elasticsearch major version
 
-Since Elasticsearch can read and use indices created in the previous major version, you don't need to change anything in GitLab's configuration when upgrading Elasticsearch.
+Since Elasticsearch can read and use indices created in the previous major version, you don't need to change anything in the GitLab configuration when upgrading Elasticsearch.
 
 The only thing worth noting is that if you have created your current index before GitLab 13.0, you might want to [reclaim the production index name](#reclaiming-the-gitlab-production-index-name) or reindex from scratch (which will implicitly create an alias). The latter might be faster depending on the GitLab instance size. Once you do that, you'll be able to perform zero-downtime reindexing and you will benefit from any future features that will make use of the alias.
 
@@ -224,8 +224,8 @@ The following Elasticsearch settings are available:
 | `AWS Secret Access Key`                               | The AWS secret access key. |
 | `Maximum file size indexed`                           | See [the explanation in instance limits.](../administration/instance_limits.md#maximum-file-size-indexed). |
 | `Maximum field length`                                | See [the explanation in instance limits.](../administration/instance_limits.md#maximum-field-length). |
-| `Maximum bulk request size (MiB)` | The Maximum Bulk Request size is used by GitLab's Golang-based indexer processes and indicates how much data it ought to collect (and store in memory) in a given indexing process before submitting the payload to Elasticsearch’s Bulk API. This setting should be used with the Bulk request concurrency setting (see below) and needs to accommodate the resource constraints of both the Elasticsearch host(s) and the host(s) running GitLab's Golang-based indexer either from the `gitlab-rake` command or the Sidekiq tasks. |
-| `Bulk request concurrency`                            | The Bulk request concurrency indicates how many of GitLab's Golang-based indexer processes (or threads) can run in parallel to collect data to subsequently submit to Elasticsearch’s Bulk API. This increases indexing performance, but fills the Elasticsearch bulk requests queue faster. This setting should be used together with the Maximum bulk request size setting (see above) and needs to accommodate the resource constraints of both the Elasticsearch host(s) and the host(s) running GitLab's Golang-based indexer either from the `gitlab-rake` command or the Sidekiq tasks. |
+| `Maximum bulk request size (MiB)` | The Maximum Bulk Request size is used by the GitLab Golang-based indexer processes and indicates how much data it ought to collect (and store in memory) in a given indexing process before submitting the payload to Elasticsearch’s Bulk API. This setting should be used with the Bulk request concurrency setting (see below) and needs to accommodate the resource constraints of both the Elasticsearch host(s) and the host(s) running the GitLab Golang-based indexer either from the `gitlab-rake` command or the Sidekiq tasks. |
+| `Bulk request concurrency`                            | The Bulk request concurrency indicates how many of the GitLab Golang-based indexer processes (or threads) can run in parallel to collect data to subsequently submit to Elasticsearch’s Bulk API. This increases indexing performance, but fills the Elasticsearch bulk requests queue faster. This setting should be used together with the Maximum bulk request size setting (see above) and needs to accommodate the resource constraints of both the Elasticsearch host(s) and the host(s) running the GitLab Golang-based indexer either from the `gitlab-rake` command or the Sidekiq tasks. |
 | `Client request timeout` | Elasticsearch HTTP client request timeout value in seconds. `0` means using the system default timeout value, which depends on the libraries that GitLab application is built upon. |
 
 ### Limiting namespaces and projects
diff --git a/doc/security/two_factor_authentication.md b/doc/security/two_factor_authentication.md
index dd73c07b2b9..a16f0ba2974 100644
--- a/doc/security/two_factor_authentication.md
+++ b/doc/security/two_factor_authentication.md
@@ -113,7 +113,7 @@ but commented out to help encourage others to add to it in the future. -->
 ## Two-factor Authentication (2FA) for Git over SSH operations
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/270554) in GitLab 13.7.
-> - It's [deployed behind a feature flag](<replace with path to>/user/feature_flags.md), disabled by default.
+> - It's [deployed behind a feature flag](../user/feature_flags.md), disabled by default.
 > - It's disabled on GitLab.com.
 > - It's not recommended for production use.
 > - To use it in GitLab self-managed instances, ask a GitLab administrator to [enable it](#enable-or-disable-two-factor-authentication-2fa-for-git-operations).
@@ -135,7 +135,7 @@ with the associated SSH key.
 
 Two-factor Authentication (2FA) for Git operations is under development and not
 ready for production use. It is deployed behind a feature flag that is
-**disabled by default**. [GitLab administrators with access to the GitLab Rails console](<replace with path to>/administration/feature_flags.md)
+**disabled by default**. [GitLab administrators with access to the GitLab Rails console](../administration/feature_flags.md)
 can enable it.
 
 To enable it:
diff --git a/doc/topics/offline/index.md b/doc/topics/offline/index.md
index a1b16c5a251..df6e1f9491e 100644
--- a/doc/topics/offline/index.md
+++ b/doc/topics/offline/index.md
@@ -16,6 +16,6 @@ If you plan to deploy a GitLab instance on a physically-isolated and offline net
 
 ## Features
 
-Follow these best practices to use GitLab's features in an offline environment:
+Follow these best practices to use GitLab features in an offline environment:
 
 - [Operating the GitLab Secure scanners in an offline environment](../../user/application_security/offline_deployments/index.md).
diff --git a/doc/topics/web_application_firewall/index.md b/doc/topics/web_application_firewall/index.md
index ac27251d9a4..1c1728d9277 100644
--- a/doc/topics/web_application_firewall/index.md
+++ b/doc/topics/web_application_firewall/index.md
@@ -16,7 +16,7 @@ much more.
 ## Overview
 
 GitLab provides a WAF out of the box after Ingress is deployed. All you need to do is deploy your
-application along with a service and Ingress resource. In GitLab's [Ingress](../../user/clusters/applications.md#ingress)
+application along with a service and Ingress resource. In the GitLab [Ingress](../../user/clusters/applications.md#ingress)
 deployment, the [ModSecurity](https://modsecurity.org/)
 module is loaded into Ingress-NGINX by default and monitors the traffic to the applications
 which have an Ingress. The ModSecurity module runs with the [OWASP Core Rule Set (CRS)](https://coreruleset.org/)
diff --git a/doc/topics/web_application_firewall/quick_start_guide.md b/doc/topics/web_application_firewall/quick_start_guide.md
index 206d8ccadf4..a29966cec73 100644
--- a/doc/topics/web_application_firewall/quick_start_guide.md
+++ b/doc/topics/web_application_firewall/quick_start_guide.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 This is a step-by-step guide to help you use the GitLab [Web Application Firewall](index.md) after
 deploying a project hosted on GitLab.com to Google Kubernetes Engine using [Auto DevOps](../autodevops/index.md).
 
-GitLab's native Kubernetes integration is used, so you do not need
+The GitLab native Kubernetes integration is used, so you do not need
 to create a Kubernetes cluster manually using the Google Cloud Platform console.
 A simple application is created and deployed based on a GitLab template.
 
@@ -17,7 +17,7 @@ These instructions also work for a self-managed GitLab instance. However, you
 need to ensure your own [runners are configured](../../ci/runners/README.md) and
 [Google OAuth is enabled](../../integration/google.md).
 
-GitLab's Web Application Firewall is deployed with [Ingress](../../user/clusters/applications.md#ingress),
+The GitLab Web Application Firewall is deployed with [Ingress](../../user/clusters/applications.md#ingress),
 so it is available to your applications no matter how you deploy them to Kubernetes.
 
 ## Configuring your Google account
@@ -32,7 +32,7 @@ Google account (for example, one that you use to access Gmail, Drive, etc.) or c
 
 NOTE:
 Every new Google Cloud Platform (GCP) account receives [$300 in credit](https://console.cloud.google.com/freetrial),
-and in partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with GitLab's
+and in partnership with Google, GitLab is able to offer an additional $200 for new GCP accounts to get started with the GitLab
 Google Kubernetes Engine integration. All you have to do is [follow this link](https://cloud.google.com/partners/partnercredit/?PCN=a0n60000006Vpz4AAC) and apply for credit.
 
 ## Creating a new project from a template
@@ -94,7 +94,7 @@ to take full advantage of Auto DevOps.
 
 ## Install Ingress
 
-GitLab's Kubernetes integration comes with some
+The GitLab Kubernetes integration comes with some
 [pre-defined applications](../../user/project/clusters/index.md#installing-applications)
 for you to install.
 
diff --git a/doc/update/README.md b/doc/update/README.md
index 38d1077c6f1..45cac3ec8ca 100644
--- a/doc/update/README.md
+++ b/doc/update/README.md
@@ -33,7 +33,7 @@ official ways to update GitLab:
 ### Linux packages (Omnibus GitLab)
 
 The [Omnibus update guide](https://docs.gitlab.com/omnibus/update/)
-contains the steps needed to update a package installed by GitLab's official
+contains the steps needed to update a package installed by official GitLab
 repositories.
 
 There are also instructions when you want to
diff --git a/doc/user/admin_area/custom_project_templates.md b/doc/user/admin_area/custom_project_templates.md
index 4ce29b5cd01..a9bc2ecf324 100644
--- a/doc/user/admin_area/custom_project_templates.md
+++ b/doc/user/admin_area/custom_project_templates.md
@@ -20,8 +20,8 @@ available to the user if they have access to them. For example:
 - Private projects will be available only if the user is a member of the project.
 
 Repository and database information that are copied over to each new project are
-identical to the data exported with
-[GitLab's Project Import/Export](../project/settings/import_export.md).
+identical to the data exported with the
+[GitLab Project Import/Export](../project/settings/import_export.md).
 
 NOTE:
 To set project templates at a group level,
diff --git a/doc/user/application_security/api_fuzzing/index.md b/doc/user/application_security/api_fuzzing/index.md
index 9113b3d204d..0607d759d28 100644
--- a/doc/user/application_security/api_fuzzing/index.md
+++ b/doc/user/application_security/api_fuzzing/index.md
@@ -147,7 +147,7 @@ data. Only run fuzzing against a test server.
 ### HTTP Archive (HAR)
 
 The [HTTP Archive format (HAR)](http://www.softwareishard.com/blog/har-12-spec/)
-is an archive file format for logging HTTP transactions. When used with GitLab's API fuzzer, HAR
+is an archive file format for logging HTTP transactions. When used with the GitLab API fuzzer, HAR
 must contain records of calling the web API to test. The API fuzzer extracts all the requests and
 uses them to perform testing.
 
@@ -243,7 +243,7 @@ developers and testers use to call various types of APIs. The API definitions
 for use with API Fuzzing. When exporting, make sure to select a supported version of Postman
 Collection: v2.0 or v2.1.
 
-When used with GitLab's API fuzzer, Postman Collections must contain definitions of the web API to
+When used with the GitLab API fuzzer, Postman Collections must contain definitions of the web API to
 test with valid data. The API fuzzer extracts all the API definitions and uses them to perform
 testing.
 
diff --git a/doc/user/application_security/container_scanning/index.md b/doc/user/application_security/container_scanning/index.md
index 3e28855eb5a..9bde2c28972 100644
--- a/doc/user/application_security/container_scanning/index.md
+++ b/doc/user/application_security/container_scanning/index.md
@@ -14,7 +14,7 @@ vulnerabilities. By including an extra job in your pipeline that scans for those
 displays them in a merge request, you can use GitLab to audit your Docker-based apps.
 By default, container scanning in GitLab is based on [Clair](https://github.com/quay/clair) and
 [Klar](https://github.com/optiopay/klar), which are open-source tools for vulnerability static analysis in
-containers. [GitLab's Klar analyzer](https://gitlab.com/gitlab-org/security-products/analyzers/klar/)
+containers. The GitLab [Klar analyzer](https://gitlab.com/gitlab-org/security-products/analyzers/klar/)
 scans the containers and serves as a wrapper for Clair.
 
 To integrate security scanners other than Clair and Klar into GitLab, see
diff --git a/doc/user/application_security/cve_id_request.md b/doc/user/application_security/cve_id_request.md
index 8c7c6cb028f..bc0c1e52626 100644
--- a/doc/user/application_security/cve_id_request.md
+++ b/doc/user/application_security/cve_id_request.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41203) in GitLab 13.4, only for public projects on GitLab.com.
 
-As part of [GitLab's role as a CVE Numbering Authority](https://about.gitlab.com/security/cve/)
+As part of [our role as a CVE Numbering Authority](https://about.gitlab.com/security/cve/)
 ([CNA](https://cve.mitre.org/cve/cna.html)), you may request
 [CVE](https://cve.mitre.org/index.html) identifiers from GitLab to track
 vulnerabilities found within your project.
@@ -33,7 +33,7 @@ If the following conditions are met, a **Request CVE ID** button appears in your
 ## Submitting a CVE ID Request
 
 Clicking the **Request CVE ID** button in the issue sidebar takes you to the new issue page for
-[GitLab's CVE project](https://gitlab.com/gitlab-org/cves).
+the [GitLab CVE project](https://gitlab.com/gitlab-org/cves).
 
 ![CVE ID request button](img/cve_id_request_button.png)
 
diff --git a/doc/user/application_security/dependency_scanning/index.md b/doc/user/application_security/dependency_scanning/index.md
index 46837ea2091..3f36e833971 100644
--- a/doc/user/application_security/dependency_scanning/index.md
+++ b/doc/user/application_security/dependency_scanning/index.md
@@ -9,7 +9,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/5105) in [GitLab Ultimate](https://about.gitlab.com/pricing/) 10.7.
 
-GitLab's Dependency Scanning feature can automatically find security vulnerabilities in your
+The Dependency Scanning feature can automatically find security vulnerabilities in your
 dependencies while you're developing and testing your applications. For example, dependency scanning
 lets you know if your application uses an external (open source) library that is known to be
 vulnerable. You can then take action to protect your application.
@@ -369,7 +369,7 @@ Here are the requirements for using dependency scanning in an offline environmen
 - If you have a limited access environment you need to allow access, such as using a proxy, to the advisory database: `https://gitlab.com/gitlab-org/security-products/gemnasium-db.git`.
   If you are unable to permit access to `https://gitlab.com/gitlab-org/security-products/gemnasium-db.git` you must host an offline copy of this `git` repository and set the `GEMNASIUM_DB_REMOTE_URL` variable to the URL of this repository. For more information on configuration variables, see [Dependency Scanning](#configuring-dependency-scanning).
 
-  This advisory database is constantly being updated, so you must periodically sync your local copy with GitLab's.
+  This advisory database is constantly being updated, so you must periodically sync your local copy with GitLab.
 
 - _Only if scanning Ruby projects_: Host an offline Git copy of the [advisory database](https://github.com/rubysec/ruby-advisory-db).
 - _Only if scanning npm/yarn projects_: Host an offline copy of the [retire.js](https://github.com/RetireJS/retire.js/) [node](https://github.com/RetireJS/retire.js/blob/master/repository/npmrepository.json) and [js](https://github.com/RetireJS/retire.js/blob/master/repository/jsrepository.json) advisory databases.
diff --git a/doc/user/group/custom_project_templates.md b/doc/user/group/custom_project_templates.md
index 639671c1345..a59b1f2e9b2 100644
--- a/doc/user/group/custom_project_templates.md
+++ b/doc/user/group/custom_project_templates.md
@@ -70,7 +70,7 @@ NOTE:
 Only direct subgroups can be set as the template source. Projects of nested subgroups of a selected template source cannot be used.
 
 Repository and database information that are copied over to each new project are
-identical to the data exported with [GitLab's Project Import/Export](../project/settings/import_export.md).
+identical to the data exported with the [GitLab Project Import/Export](../project/settings/import_export.md).
 
 <!-- ## Troubleshooting
 
diff --git a/doc/user/project/deploy_boards.md b/doc/user/project/deploy_boards.md
index 6673a746aa6..7546556a7c0 100644
--- a/doc/user/project/deploy_boards.md
+++ b/doc/user/project/deploy_boards.md
@@ -10,7 +10,7 @@ type: howto, reference
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/1589) in [GitLab Premium](https://about.gitlab.com/pricing/) 9.0.
 > - [Moved](<https://gitlab.com/gitlab-org/gitlab/-/issues/212320>) to GitLab Core in 13.7.
 
-GitLab's Deploy Boards offer a consolidated view of the current health and
+GitLab Deploy Boards offer a consolidated view of the current health and
 status of each CI [environment](../../ci/environments/index.md) running on [Kubernetes](https://kubernetes.io), displaying the status
 of the pods in the deployment. Developers and other teammates can view the
 progress and status of a rollout, pod by pod, in the workflow they already use
diff --git a/doc/user/project/deploy_tokens/index.md b/doc/user/project/deploy_tokens/index.md
index 40959c87dec..ac19c44c58a 100644
--- a/doc/user/project/deploy_tokens/index.md
+++ b/doc/user/project/deploy_tokens/index.md
@@ -93,7 +93,7 @@ To read the container registry images, you'll need to:
 
 1. Create a Deploy Token with `read_registry` as a scope.
 1. Take note of your `username` and `token`.
-1. Sign in to GitLab’s Container Registry using the deploy token:
+1. Sign in to the GitLab Container Registry using the deploy token:
 
 ```shell
 docker login -u <username> -p <deploy_token> registry.example.com
@@ -110,7 +110,7 @@ To push the container registry images, you'll need to:
 
 1. Create a Deploy Token with `write_registry` as a scope.
 1. Take note of your `username` and `token`.
-1. Sign in to GitLab’s Container Registry using the deploy token:
+1. Sign in to the GitLab Container Registry using the deploy token:
 
    ```shell
    docker login -u <username> -p <deploy_token> registry.example.com
diff --git a/doc/user/project/import/bitbucket.md b/doc/user/project/import/bitbucket.md
index d413bcb5a27..6f274dd12a2 100644
--- a/doc/user/project/import/bitbucket.md
+++ b/doc/user/project/import/bitbucket.md
@@ -38,10 +38,10 @@ to enable this if not already.
 ## How it works
 
 When issues/pull requests are being imported, the Bitbucket importer tries to find
-the Bitbucket author/assignee in GitLab's database using the Bitbucket `nickname`.
+the Bitbucket author/assignee in the GitLab database using the Bitbucket `nickname`.
 For this to work, the Bitbucket author/assignee should have signed in beforehand in GitLab
 and **associated their Bitbucket account**. Their `nickname` must also match their Bitbucket
-`username.`. If the user is not found in GitLab's database, the project creator
+`username.`. If the user is not found in the GitLab database, the project creator
 (most of the times the current user that started the import process) is set as the author,
 but a reference on the issue about the original Bitbucket author is kept.
 
diff --git a/doc/user/project/import/gitea.md b/doc/user/project/import/gitea.md
index 3ce1150fe03..26e5a86b808 100644
--- a/doc/user/project/import/gitea.md
+++ b/doc/user/project/import/gitea.md
@@ -27,7 +27,7 @@ This requires Gitea `v1.0.0` or newer.
 ## How it works
 
 Since Gitea is currently not an OAuth provider, author/assignee cannot be mapped
-to users in your GitLab's instance. This means that the project creator (most of
+to users in your GitLab instance. This means that the project creator (most of
 the times the current user that started the import process) is set as the author,
 but a reference on the issue about the original Gitea author is kept.
 
diff --git a/doc/user/project/import/github.md b/doc/user/project/import/github.md
index 9a74638db0b..8b6d86b14c9 100644
--- a/doc/user/project/import/github.md
+++ b/doc/user/project/import/github.md
@@ -65,7 +65,7 @@ must meet one of the following conditions prior to the import:
   [primary email address](https://docs.github.com/en/free-pro-team@latest/rest/reference/users#get-a-user)
   on their profile that matches their GitLab account's email address.
 
-If a user referenced in the project is not found in GitLab's database, the project creator (typically the user
+If a user referenced in the project is not found in the GitLab database, the project creator (typically the user
 that initiated the import process) is set as the author/assignee, but a note on the issue mentioning the original
 GitHub author is added.
 
@@ -103,7 +103,7 @@ If you are using a self-managed GitLab instance or if you are importing from Git
 1. From the top navigation bar, click **+** and select **New project**.
 1. Select the **Import project** tab and then select **GitHub**.
 1. Select the first button to **List your GitHub repositories**. You are redirected to a page on [GitHub](https://github.com) to authorize the GitLab application.
-1. Click **Authorize GitlabHQ**. You are redirected back to GitLab's Import page and all of your GitHub repositories are listed.
+1. Click **Authorize GitlabHQ**. You are redirected back to the GitLab Import page and all of your GitHub repositories are listed.
 1. Continue on to [selecting which repositories to import](#selecting-which-repositories-to-import).
 
 ### Using a GitHub token
diff --git a/doc/user/project/issues/index.md b/doc/user/project/issues/index.md
index 16208c9196e..18c106731b9 100644
--- a/doc/user/project/issues/index.md
+++ b/doc/user/project/issues/index.md
@@ -35,7 +35,7 @@ you can also view all the issues collectively at the group level.
 See also [Always start a discussion with an issue](https://about.gitlab.com/blog/2016/03/03/start-with-an-issue/).
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
-To learn how GitLab's Strategic Marketing department uses GitLab issues with [labels](../labels.md) and
+To learn how the GitLab Strategic Marketing department uses GitLab issues with [labels](../labels.md) and
 [issue boards](../issue_board.md), see the video on
 [Managing Commitments with Issues](https://www.youtube.com/watch?v=cuIHNintg1o&t=3).
 
diff --git a/doc/user/project/issues/managing_issues.md b/doc/user/project/issues/managing_issues.md
index 95525561528..03060ca720c 100644
--- a/doc/user/project/issues/managing_issues.md
+++ b/doc/user/project/issues/managing_issues.md
@@ -234,7 +234,7 @@ This translates to the following keywords:
 - Resolve, Resolves, Resolved, Resolving, resolve, resolves, resolved, resolving
 - Implement, Implements, Implemented, Implementing, implement, implements, implemented, implementing
 
-Note that `%{issue_ref}` is a complex regular expression defined inside GitLab's
+Note that `%{issue_ref}` is a complex regular expression defined inside the GitLab
 source code that can match references to:
 
 - A local issue (`#123`).
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
index f4c1642c0f1..f8173b4c004 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/index.md
@@ -296,7 +296,7 @@ To make your website's visitors even more secure, you can choose to
 force HTTPS for GitLab Pages. By doing so, all attempts to visit your
 website via HTTP will be automatically redirected to HTTPS via 301.
 
-It works with both GitLab's default domain and with your custom
+It works with both the GitLab default domain and with your custom
 domain (as long as you've set a valid certificate for it).
 
 To enable this setting:
diff --git a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
index 98581899791..3dea35153e4 100644
--- a/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
+++ b/doc/user/project/pages/custom_domains_ssl_tls_certification/lets_encrypt_integration.md
@@ -33,7 +33,7 @@ Before you can enable automatic provisioning of an SSL certificate for your doma
   and verified your ownership.
 - Verified your website is up and running, accessible through your custom domain.
 
-GitLab's Let's Encrypt integration is enabled and available on GitLab.com.
+The GitLab integration with Let's Encrypt is enabled and available on GitLab.com.
 For **self-managed** GitLab instances, make sure your administrator has
 [enabled it](../../../../administration/pages/index.md#lets-encrypt-integration).
 
diff --git a/doc/user/project/pages/index.md b/doc/user/project/pages/index.md
index 5e123a7ec9e..846d30e898c 100644
--- a/doc/user/project/pages/index.md
+++ b/doc/user/project/pages/index.md
@@ -83,7 +83,7 @@ to build your site and publish it to the GitLab Pages server. The sequence of
 scripts that GitLab CI/CD runs to accomplish this task is created from a file named
 `.gitlab-ci.yml`, which you can [create and modify](getting_started/pages_from_scratch.md) at will. A specific `job` called `pages` in the configuration file will make GitLab aware that you are deploying a GitLab Pages website.
 
-You can either use GitLab's [default domain for GitLab Pages websites](getting_started_part_one.md#gitlab-pages-default-domain-names),
+You can either use the GitLab [default domain for GitLab Pages websites](getting_started_part_one.md#gitlab-pages-default-domain-names),
 `*.gitlab.io`, or your own domain (`example.com`). In that case, you'll
 need administrator access to your domain's registrar (or control panel) to set it up with Pages.
 
diff --git a/doc/user/project/pages/introduction.md b/doc/user/project/pages/introduction.md
index 9025cfe2fdc..5a284bf57c3 100644
--- a/doc/user/project/pages/introduction.md
+++ b/doc/user/project/pages/introduction.md
@@ -280,4 +280,4 @@ No, you don't. You can create your project first and it will be accessed under
 
 ## Known issues
 
-For a list of known issues, visit GitLab's [public issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues?label_name[]=Category%3APages).
+For a list of known issues, visit the GitLab [public issue tracker](https://gitlab.com/gitlab-org/gitlab/-/issues?label_name[]=Category%3APages).
diff --git a/doc/user/project/quick_actions.md b/doc/user/project/quick_actions.md
index 5b82a411401..9f849051f40 100644
--- a/doc/user/project/quick_actions.md
+++ b/doc/user/project/quick_actions.md
@@ -13,7 +13,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 >   quick actions when updating the description of issues, epics, and merge requests.
 
 Quick actions are textual shortcuts for common actions on issues, epics, merge requests,
-and commits that are usually done by clicking buttons or dropdowns in GitLab's UI.
+and commits that are usually done by clicking buttons or dropdowns in the GitLab UI.
 You can enter these commands in the description or in comments of issues, epics, merge requests, and commits.
 Each command should be on a separate line in order to be properly detected and executed.
 
diff --git a/doc/user/project/releases/index.md b/doc/user/project/releases/index.md
index 2944dc9de3e..7b412270938 100644
--- a/doc/user/project/releases/index.md
+++ b/doc/user/project/releases/index.md
@@ -470,7 +470,7 @@ In the API:
 > [Introduced](https://gitlab.com/gitlab-org/release-cli/-/merge_requests/6) in GitLab 12.10.
 
 The Release CLI is a command-line tool for managing GitLab Releases from the command line or from
-GitLab's CI/CD configuration file, `.gitlab-ci.yml`.
+the GitLab CI/CD configuration file, `.gitlab-ci.yml`.
 
 With it, you can create, update, modify, and delete releases right through the
 terminal.
diff --git a/lib/api/discussions.rb b/lib/api/discussions.rb
index 4c4ec200060..580d546b360 100644
--- a/lib/api/discussions.rb
+++ b/lib/api/discussions.rb
@@ -104,6 +104,7 @@ module API
             position: params[:position],
             id_key => noteable.id
           }
+          opts[:commit_id] = params[:commit_id] if noteable.is_a?(MergeRequest) && type == 'DiffNote'
 
           note = create_note(noteable, opts)
 
diff --git a/lib/api/entities/note.rb b/lib/api/entities/note.rb
index f22ab73afd0..9a60c04220d 100644
--- a/lib/api/entities/note.rb
+++ b/lib/api/entities/note.rb
@@ -14,6 +14,7 @@ module API
       expose :created_at, :updated_at
       expose :system?, as: :system
       expose :noteable_id, :noteable_type
+      expose :commit_id, if: ->(note, options) { note.noteable_type == "MergeRequest" && note.is_a?(DiffNote) }
 
       expose :position, if: ->(note, options) { note.is_a?(DiffNote) } do |note|
         note.position.to_h
diff --git a/spec/factories/project_repository_storage_moves.rb b/spec/factories/project_repository_storage_moves.rb
index c0068de5f58..5df2b7c32d6 100644
--- a/spec/factories/project_repository_storage_moves.rb
+++ b/spec/factories/project_repository_storage_moves.rb
@@ -2,7 +2,7 @@
 
 FactoryBot.define do
   factory :project_repository_storage_move, class: 'ProjectRepositoryStorageMove' do
-    project
+    container { association(:project) }
 
     source_storage_name { 'default' }
 
diff --git a/spec/models/project_repository_storage_move_spec.rb b/spec/models/project_repository_storage_move_spec.rb
index 5069258c540..85d3293a3b1 100644
--- a/spec/models/project_repository_storage_move_spec.rb
+++ b/spec/models/project_repository_storage_move_spec.rb
@@ -3,116 +3,11 @@
 require 'spec_helper'
 
 RSpec.describe ProjectRepositoryStorageMove, type: :model do
-  describe 'associations' do
-    it { is_expected.to belong_to(:project) }
-  end
+  it_behaves_like 'handles repository moves' do
+    let_it_be_with_refind(:container) { create(:project) }
 
-  describe 'validations' do
-    it { is_expected.to validate_presence_of(:project) }
-    it { is_expected.to validate_presence_of(:state) }
-    it { is_expected.to validate_presence_of(:source_storage_name) }
-    it { is_expected.to validate_presence_of(:destination_storage_name) }
-
-    context 'source_storage_name inclusion' do
-      subject { build(:project_repository_storage_move, source_storage_name: 'missing') }
-
-      it "does not allow repository storages that don't match a label in the configuration" do
-        expect(subject).not_to be_valid
-        expect(subject.errors[:source_storage_name].first).to match(/is not included in the list/)
-      end
-    end
-
-    context 'destination_storage_name inclusion' do
-      subject { build(:project_repository_storage_move, destination_storage_name: 'missing') }
-
-      it "does not allow repository storages that don't match a label in the configuration" do
-        expect(subject).not_to be_valid
-        expect(subject.errors[:destination_storage_name].first).to match(/is not included in the list/)
-      end
-    end
-
-    context 'project repository read-only' do
-      subject { build(:project_repository_storage_move, project: project) }
-
-      let(:project) { build(:project, repository_read_only: true) }
-
-      it "does not allow the project to be read-only on create" do
-        expect(subject).not_to be_valid
-        expect(subject.errors[:project].first).to match(/is read only/)
-      end
-    end
-  end
-
-  describe 'defaults' do
-    context 'destination_storage_name' do
-      subject { build(:project_repository_storage_move) }
-
-      it 'picks storage from ApplicationSetting' do
-        expect(Gitlab::CurrentSettings).to receive(:pick_repository_storage).and_return('picked').at_least(:once)
-
-        expect(subject.destination_storage_name).to eq('picked')
-      end
-    end
-  end
-
-  describe 'state transitions' do
-    let(:project) { create(:project) }
-
-    before do
-      stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
-    end
-
-    context 'when in the default state' do
-      subject(:storage_move) { create(:project_repository_storage_move, project: project, destination_storage_name: 'test_second_storage') }
-
-      context 'and transits to scheduled' do
-        it 'triggers ProjectUpdateRepositoryStorageWorker' do
-          expect(ProjectUpdateRepositoryStorageWorker).to receive(:perform_async).with(project.id, 'test_second_storage', storage_move.id)
-
-          storage_move.schedule!
-
-          expect(project).to be_repository_read_only
-        end
-
-        context 'when the transition fails' do
-          it 'does not trigger ProjectUpdateRepositoryStorageWorker and adds an error' do
-            allow(storage_move.project).to receive(:set_repository_read_only!).and_raise(StandardError, 'foobar')
-            expect(ProjectUpdateRepositoryStorageWorker).not_to receive(:perform_async)
-
-            storage_move.schedule!
-
-            expect(storage_move.errors[:project]).to include('foobar')
-          end
-        end
-      end
-
-      context 'and transits to started' do
-        it 'does not allow the transition' do
-          expect { storage_move.start! }
-            .to raise_error(StateMachines::InvalidTransition)
-        end
-      end
-    end
-
-    context 'when started' do
-      subject(:storage_move) { create(:project_repository_storage_move, :started, project: project, destination_storage_name: 'test_second_storage') }
-
-      context 'and transits to replicated' do
-        it 'sets the repository storage and marks the project as writable' do
-          storage_move.finish_replication!
-
-          expect(project.repository_storage).to eq('test_second_storage')
-          expect(project).not_to be_repository_read_only
-        end
-      end
-
-      context 'and transits to failed' do
-        it 'marks the project as writable' do
-          storage_move.do_fail!
-
-          expect(project).not_to be_repository_read_only
-        end
-      end
-    end
+    let(:repository_storage_factory_key) { :project_repository_storage_move }
+    let(:error_key) { :project }
+    let(:repository_storage_worker) { ProjectUpdateRepositoryStorageWorker }
   end
 end
diff --git a/spec/requests/api/discussions_spec.rb b/spec/requests/api/discussions_spec.rb
index 720ea429c2c..bdfc1589c9e 100644
--- a/spec/requests/api/discussions_spec.rb
+++ b/spec/requests/api/discussions_spec.rb
@@ -61,6 +61,37 @@ RSpec.describe API::Discussions do
         expect(response).to have_gitlab_http_status(:bad_request)
       end
     end
+
+    context "when a commit parameter is given" do
+      it "creates the discussion on that commit within the merge request" do
+        # SHAs of "feature" and its parent in spec/support/gitlab-git-test.git
+        mr_commit = '0b4bc9a49b562e85de7cc9e834518ea6828729b9'
+        parent_commit = 'ae73cb07c9eeaf35924a10f713b364d32b2dd34f'
+        file = "files/ruby/feature.rb"
+        line_range = {
+          "start_line_code" => Gitlab::Git.diff_line_code(file, 1, 1),
+          "end_line_code" => Gitlab::Git.diff_line_code(file, 1, 1),
+          "start_line_type" => "text",
+          "end_line_type" => "text"
+        }
+        position = build(
+          :text_diff_position,
+          :added,
+          file: file,
+          new_line: 1,
+          line_range: line_range,
+          base_sha: parent_commit,
+          head_sha: mr_commit,
+          start_sha: parent_commit
+        )
+
+        post api("/projects/#{project.id}/merge_requests/#{noteable['iid']}/discussions", user),
+          params: { body: 'MR discussion on commit', position: position.to_h, commit_id: mr_commit }
+
+        expect(response).to have_gitlab_http_status(:created)
+        expect(json_response['notes'].first['commit_id']).to eq(mr_commit)
+      end
+    end
   end
 
   context 'when noteable is a Commit' do
diff --git a/spec/requests/api/project_repository_storage_moves_spec.rb b/spec/requests/api/project_repository_storage_moves_spec.rb
index 923cd158c98..15e69c2aa16 100644
--- a/spec/requests/api/project_repository_storage_moves_spec.rb
+++ b/spec/requests/api/project_repository_storage_moves_spec.rb
@@ -7,7 +7,7 @@ RSpec.describe API::ProjectRepositoryStorageMoves do
 
   let_it_be(:user) { create(:admin) }
   let_it_be(:project) { create(:project, :repository).tap { |project| project.track_project_repository } }
-  let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, project: project) }
+  let_it_be(:storage_move) { create(:project_repository_storage_move, :scheduled, container: project) }
 
   shared_examples 'get single project repository storage move' do
     let(:project_repository_storage_move_id) { storage_move.id }
@@ -63,14 +63,14 @@ RSpec.describe API::ProjectRepositoryStorageMoves do
 
       control = ActiveRecord::QueryRecorder.new { get_project_repository_storage_moves }
 
-      create(:project_repository_storage_move, :scheduled, project: project)
+      create(:project_repository_storage_move, :scheduled, container: project)
 
       expect { get_project_repository_storage_moves }.not_to exceed_query_limit(control)
     end
 
     it 'returns the most recently created first' do
-      storage_move_oldest = create(:project_repository_storage_move, :scheduled, project: project, created_at: 2.days.ago)
-      storage_move_middle = create(:project_repository_storage_move, :scheduled, project: project, created_at: 1.day.ago)
+      storage_move_oldest = create(:project_repository_storage_move, :scheduled, container: project, created_at: 2.days.ago)
+      storage_move_middle = create(:project_repository_storage_move, :scheduled, container: project, created_at: 1.day.ago)
 
       get_project_repository_storage_moves
 
diff --git a/spec/services/members/create_service_spec.rb b/spec/services/members/create_service_spec.rb
index 00b5ff59e48..e8a4a798b20 100644
--- a/spec/services/members/create_service_spec.rb
+++ b/spec/services/members/create_service_spec.rb
@@ -3,59 +3,68 @@
 require 'spec_helper'
 
 RSpec.describe Members::CreateService do
-  let(:project) { create(:project) }
-  let(:user) { create(:user) }
-  let(:project_user) { create(:user) }
+  let_it_be(:project) { create(:project) }
+  let_it_be(:user) { create(:user) }
+  let_it_be(:project_user) { create(:user) }
+  let_it_be(:user_ids) { project_user.id.to_s }
+  let_it_be(:access_level) { Gitlab::Access::GUEST }
+  let(:params) { { user_ids: user_ids, access_level: access_level } }
+
+  subject(:execute_service) { described_class.new(user, params).execute(project) }
 
   before do
     project.add_maintainer(user)
+    allow(Namespaces::OnboardingUserAddedWorker).to receive(:idempotent?).and_return(false)
   end
 
-  it 'adds user to members' do
-    params = { user_ids: project_user.id.to_s, access_level: Gitlab::Access::GUEST }
-    result = described_class.new(user, params).execute(project)
-
-    expect(result[:status]).to eq(:success)
-    expect(project.users).to include project_user
+  context 'when passing valid parameters' do
+    it 'adds a user to members' do
+      expect(execute_service[:status]).to eq(:success)
+      expect(project.users).to include project_user
+      expect(Namespaces::OnboardingUserAddedWorker.jobs.last['args'][0]).to eq(project.id)
+    end
   end
 
-  it 'adds no user to members' do
-    params = { user_ids: '', access_level: Gitlab::Access::GUEST }
-    result = described_class.new(user, params).execute(project)
+  context 'when passing no user ids' do
+    let(:user_ids) { '' }
 
-    expect(result[:status]).to eq(:error)
-    expect(result[:message]).to be_present
-    expect(project.users).not_to include project_user
+    it 'does not add a member' do
+      expect(execute_service[:status]).to eq(:error)
+      expect(execute_service[:message]).to be_present
+      expect(project.users).not_to include project_user
+      expect(Namespaces::OnboardingUserAddedWorker.jobs.size).to eq(0)
+    end
   end
 
-  it 'limits the number of users to 100' do
-    user_ids = 1.upto(101).to_a.join(',')
-    params = { user_ids: user_ids, access_level: Gitlab::Access::GUEST }
+  context 'when passing many user ids' do
+    let(:user_ids) { 1.upto(101).to_a.join(',') }
 
-    result = described_class.new(user, params).execute(project)
-
-    expect(result[:status]).to eq(:error)
-    expect(result[:message]).to be_present
-    expect(project.users).not_to include project_user
+    it 'limits the number of users to 100' do
+      expect(execute_service[:status]).to eq(:error)
+      expect(execute_service[:message]).to be_present
+      expect(project.users).not_to include project_user
+      expect(Namespaces::OnboardingUserAddedWorker.jobs.size).to eq(0)
+    end
   end
 
-  it 'does not add an invalid member' do
-    params = { user_ids: project_user.id.to_s, access_level: -1 }
-    result = described_class.new(user, params).execute(project)
+  context 'when passing an invalid access level' do
+    let(:access_level) { -1 }
 
-    expect(result[:status]).to eq(:error)
-    expect(result[:message]).to include("#{project_user.username}: Access level is not included in the list")
-    expect(project.users).not_to include project_user
+    it 'does not add a member' do
+      expect(execute_service[:status]).to eq(:error)
+      expect(execute_service[:message]).to include("#{project_user.username}: Access level is not included in the list")
+      expect(project.users).not_to include project_user
+      expect(Namespaces::OnboardingUserAddedWorker.jobs.size).to eq(0)
+    end
   end
 
-  it 'does not add a member with an existing invite' do
-    invited_member = create(:project_member, :invited, project: project)
+  context 'when passing an existing invite user id' do
+    let(:user_ids) { create(:project_member, :invited, project: project).invite_email }
 
-    params = { user_ids: invited_member.invite_email,
-               access_level: Gitlab::Access::GUEST }
-    result = described_class.new(user, params).execute(project)
-
-    expect(result[:status]).to eq(:error)
-    expect(result[:message]).to eq('Invite email has already been taken')
+    it 'does not add a member' do
+      expect(execute_service[:status]).to eq(:error)
+      expect(execute_service[:message]).to eq('Invite email has already been taken')
+      expect(Namespaces::OnboardingUserAddedWorker.jobs.size).to eq(0)
+    end
   end
 end
diff --git a/spec/services/onboarding_progress_service_spec.rb b/spec/services/onboarding_progress_service_spec.rb
index edf40dfeed1..59b6083d38a 100644
--- a/spec/services/onboarding_progress_service_spec.rb
+++ b/spec/services/onboarding_progress_service_spec.rb
@@ -4,16 +4,30 @@ require 'spec_helper'
 
 RSpec.describe OnboardingProgressService do
   describe '#execute' do
-    let_it_be(:namespace) { build(:namespace) }
-    let(:action) { :namespace_action }
+    let(:namespace) { create(:namespace, parent: root_namespace) }
 
-    subject(:execute_service) { described_class.new(namespace).execute(action: action) }
+    subject(:execute_service) { described_class.new(namespace).execute(action: :subscription_created) }
 
-    it 'records a namespace onboarding progress action' do
-      expect(NamespaceOnboardingAction).to receive(:create_action)
-            .with(namespace, :namespace_action)
+    context 'when the namespace is a root' do
+      let(:root_namespace) { nil }
 
-      subject
+      it 'records a namespace onboarding progress action for the given namespace' do
+        expect(NamespaceOnboardingAction).to receive(:create_action)
+              .with(namespace, :subscription_created).and_call_original
+
+        expect { execute_service }.to change(NamespaceOnboardingAction, :count).by(1)
+      end
+    end
+
+    context 'when the namespace is not the root' do
+      let_it_be(:root_namespace) { build(:namespace) }
+
+      it 'records a namespace onboarding progress action for the root namespace' do
+        expect(NamespaceOnboardingAction).to receive(:create_action)
+              .with(root_namespace, :subscription_created).and_call_original
+
+        expect { execute_service }.to change(NamespaceOnboardingAction, :count).by(1)
+      end
     end
   end
 end
diff --git a/spec/services/projects/fork_service_spec.rb b/spec/services/projects/fork_service_spec.rb
index 6eadcc48d5b..60dfee820ca 100644
--- a/spec/services/projects/fork_service_spec.rb
+++ b/spec/services/projects/fork_service_spec.rb
@@ -325,7 +325,7 @@ RSpec.describe Projects::ForkService do
       storage_move = create(
         :project_repository_storage_move,
         :scheduled,
-        project: project,
+        container: project,
         destination_storage_name: 'test_second_storage'
       )
       Projects::UpdateRepositoryStorageService.new(storage_move).execute
diff --git a/spec/services/projects/update_repository_storage_service_spec.rb b/spec/services/projects/update_repository_storage_service_spec.rb
index 123f604e7a4..ef8f166cc3f 100644
--- a/spec/services/projects/update_repository_storage_service_spec.rb
+++ b/spec/services/projects/update_repository_storage_service_spec.rb
@@ -18,7 +18,7 @@ RSpec.describe Projects::UpdateRepositoryStorageService do
     context 'without wiki and design repository' do
       let(:project) { create(:project, :repository, wiki_enabled: false) }
       let(:destination) { 'test_second_storage' }
-      let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, project: project, destination_storage_name: destination) }
+      let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, container: project, destination_storage_name: destination) }
       let!(:checksum) { project.repository.checksum }
       let(:project_repository_double) { double(:repository) }
       let(:original_project_repository_double) { double(:repository) }
@@ -144,7 +144,7 @@ RSpec.describe Projects::UpdateRepositoryStorageService do
       end
 
       context 'when the repository move is finished' do
-        let(:repository_storage_move) { create(:project_repository_storage_move, :finished, project: project, destination_storage_name: destination) }
+        let(:repository_storage_move) { create(:project_repository_storage_move, :finished, container: project, destination_storage_name: destination) }
 
         it 'is idempotent' do
           expect do
@@ -156,7 +156,7 @@ RSpec.describe Projects::UpdateRepositoryStorageService do
       end
 
       context 'when the repository move is failed' do
-        let(:repository_storage_move) { create(:project_repository_storage_move, :failed, project: project, destination_storage_name: destination) }
+        let(:repository_storage_move) { create(:project_repository_storage_move, :failed, container: project, destination_storage_name: destination) }
 
         it 'is idempotent' do
           expect do
@@ -170,7 +170,7 @@ RSpec.describe Projects::UpdateRepositoryStorageService do
 
     context 'project with no repositories' do
       let(:project) { create(:project) }
-      let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, project: project, destination_storage_name: 'test_second_storage') }
+      let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, container: project, destination_storage_name: 'test_second_storage') }
 
       it 'updates the database' do
         allow(Gitlab::GitalyClient).to receive(:filesystem_id).with('default').and_call_original
@@ -191,7 +191,7 @@ RSpec.describe Projects::UpdateRepositoryStorageService do
         let(:project) { create(:project, :repository, wiki_enabled: true) }
         let(:repository) { project.wiki.repository }
         let(:destination) { 'test_second_storage' }
-        let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, project: project, destination_storage_name: destination) }
+        let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, container: project, destination_storage_name: destination) }
 
         before do
           project.create_wiki
@@ -204,7 +204,7 @@ RSpec.describe Projects::UpdateRepositoryStorageService do
         let(:project) { create(:project, :repository) }
         let(:repository) { project.design_repository }
         let(:destination) { 'test_second_storage' }
-        let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, project: project, destination_storage_name: destination) }
+        let(:repository_storage_move) { create(:project_repository_storage_move, :scheduled, container: project, destination_storage_name: destination) }
 
         before do
           project.design_repository.create_if_not_exists
diff --git a/spec/support/shared_examples/models/concerns/repository_storage_movable_shared_examples.rb b/spec/support/shared_examples/models/concerns/repository_storage_movable_shared_examples.rb
new file mode 100644
index 00000000000..d6059eaff33
--- /dev/null
+++ b/spec/support/shared_examples/models/concerns/repository_storage_movable_shared_examples.rb
@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+RSpec.shared_examples 'handles repository moves' do
+  describe 'associations' do
+    it { is_expected.to belong_to(:container) }
+  end
+
+  describe 'validations' do
+    it { is_expected.to validate_presence_of(:container) }
+    it { is_expected.to validate_presence_of(:state) }
+    it { is_expected.to validate_presence_of(:source_storage_name) }
+    it { is_expected.to validate_presence_of(:destination_storage_name) }
+
+    context 'source_storage_name inclusion' do
+      subject { build(repository_storage_factory_key, source_storage_name: 'missing') }
+
+      it "does not allow repository storages that don't match a label in the configuration" do
+        expect(subject).not_to be_valid
+        expect(subject.errors[:source_storage_name].first).to match(/is not included in the list/)
+      end
+    end
+
+    context 'destination_storage_name inclusion' do
+      subject { build(repository_storage_factory_key, destination_storage_name: 'missing') }
+
+      it "does not allow repository storages that don't match a label in the configuration" do
+        expect(subject).not_to be_valid
+        expect(subject.errors[:destination_storage_name].first).to match(/is not included in the list/)
+      end
+    end
+
+    context 'container repository read-only' do
+      subject { build(repository_storage_factory_key, container: container) }
+
+      it "does not allow the container to be read-only on create" do
+        container.update!(repository_read_only: true)
+
+        expect(subject).not_to be_valid
+        expect(subject.errors[error_key].first).to match(/is read only/)
+      end
+    end
+  end
+
+  describe 'defaults' do
+    context 'destination_storage_name' do
+      subject { build(repository_storage_factory_key) }
+
+      it 'picks storage from ApplicationSetting' do
+        expect(Gitlab::CurrentSettings).to receive(:pick_repository_storage).and_return('picked').at_least(:once)
+
+        expect(subject.destination_storage_name).to eq('picked')
+      end
+    end
+  end
+
+  describe 'state transitions' do
+    before do
+      stub_storage_settings('test_second_storage' => { 'path' => 'tmp/tests/extra_storage' })
+    end
+
+    context 'when in the default state' do
+      subject(:storage_move) { create(repository_storage_factory_key, container: container, destination_storage_name: 'test_second_storage') }
+
+      context 'and transits to scheduled' do
+        it 'triggers the corresponding repository storage worker' do
+          expect(repository_storage_worker).to receive(:perform_async).with(container.id, 'test_second_storage', storage_move.id)
+
+          storage_move.schedule!
+
+          expect(container).to be_repository_read_only
+        end
+
+        context 'when the transition fails' do
+          it 'does not trigger ProjectUpdateRepositoryStorageWorker and adds an error' do
+            allow(storage_move.container).to receive(:set_repository_read_only!).and_raise(StandardError, 'foobar')
+            expect(repository_storage_worker).not_to receive(:perform_async)
+
+            storage_move.schedule!
+
+            expect(storage_move.errors[error_key]).to include('foobar')
+          end
+        end
+      end
+
+      context 'and transits to started' do
+        it 'does not allow the transition' do
+          expect { storage_move.start! }
+            .to raise_error(StateMachines::InvalidTransition)
+        end
+      end
+    end
+
+    context 'when started' do
+      subject(:storage_move) { create(repository_storage_factory_key, :started, container: container, destination_storage_name: 'test_second_storage') }
+
+      context 'and transits to replicated' do
+        it 'sets the repository storage and marks the container as writable' do
+          storage_move.finish_replication!
+
+          expect(container.repository_storage).to eq('test_second_storage')
+          expect(container).not_to be_repository_read_only
+        end
+      end
+
+      context 'and transits to failed' do
+        it 'marks the container as writable' do
+          storage_move.do_fail!
+
+          expect(container).not_to be_repository_read_only
+        end
+      end
+    end
+  end
+end
diff --git a/spec/workers/namespaces/onboarding_user_added_worker_spec.rb b/spec/workers/namespaces/onboarding_user_added_worker_spec.rb
new file mode 100644
index 00000000000..03c668259f8
--- /dev/null
+++ b/spec/workers/namespaces/onboarding_user_added_worker_spec.rb
@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+RSpec.describe Namespaces::OnboardingUserAddedWorker, '#perform' do
+  include AfterNextHelpers
+
+  let_it_be(:group) { create(:group) }
+
+  it 'records the event' do
+    expect_next(OnboardingProgressService, group)
+      .to receive(:execute).with(action: :user_added).and_call_original
+
+    expect { subject.perform(group.id) }.to change(NamespaceOnboardingAction, :count).by(1)
+  end
+end