Add latest changes from gitlab-org/gitlab@master

37 files changed, 148 insertions, 134 deletions

diff --git a/app/models/ci/runner.rb b/app/models/ci/runner.rb
index 11150e839a3..745ecf6fc08 100644
--- a/app/models/ci/runner.rb
+++ b/app/models/ci/runner.rb
@@ -200,7 +200,7 @@ module Ci
 
     validates :config, json_schema: { filename: 'ci_runner_config' }
 
-    validates :maintenance_note, length: { maximum: 255 }
+    validates :maintenance_note, length: { maximum: 1024 }
 
     alias_attribute :maintenance_note, :maintainer_note
 
diff --git a/app/models/project.rb b/app/models/project.rb
index efbb8b5322d..57a5d0a0211 100644
--- a/app/models/project.rb
+++ b/app/models/project.rb
@@ -1926,12 +1926,12 @@ class Project < ApplicationRecord
                .delete_all
   end
 
-  def mark_pages_as_deployed(artifacts_archive: nil)
-    ensure_pages_metadatum.update!(deployed: true, artifacts_archive: artifacts_archive)
+  def mark_pages_as_deployed
+    ensure_pages_metadatum.update!(deployed: true)
   end
 
   def mark_pages_as_not_deployed
-    ensure_pages_metadatum.update!(deployed: false, artifacts_archive: nil, pages_deployment: nil)
+    ensure_pages_metadatum.update!(deployed: false)
   end
 
   def update_pages_deployment!(deployment)
diff --git a/app/models/project_pages_metadatum.rb b/app/models/project_pages_metadatum.rb
index 58dbac9057f..dc1e9319340 100644
--- a/app/models/project_pages_metadatum.rb
+++ b/app/models/project_pages_metadatum.rb
@@ -4,11 +4,13 @@ class ProjectPagesMetadatum < ApplicationRecord
   extend SuppressCompositePrimaryKeyWarning
 
   include EachBatch
+  include IgnorableColumns
 
   self.primary_key = :project_id
 
+  ignore_columns :artifacts_archive_id, remove_with: '15.0', remove_after: '2022-04-22'
+
   belongs_to :project, inverse_of: :pages_metadatum
-  belongs_to :artifacts_archive, class_name: 'Ci::JobArtifact'
   belongs_to :pages_deployment
 
   scope :deployed, -> { where(deployed: true) }
diff --git a/app/services/projects/update_pages_service.rb b/app/services/projects/update_pages_service.rb
index 0000e713cb4..2ec965fe2f4 100644
--- a/app/services/projects/update_pages_service.rb
+++ b/app/services/projects/update_pages_service.rb
@@ -22,8 +22,8 @@ module Projects
       register_attempt
 
       # Create status notifying the deployment of pages
-      @status = build_commit_status
-      ::Ci::Pipelines::AddJobService.new(@build.pipeline).execute!(@status) do |job|
+      @commit_status = build_commit_status
+      ::Ci::Pipelines::AddJobService.new(@build.pipeline).execute!(@commit_status) do |job|
         job.enqueue!
         job.run!
       end
@@ -46,17 +46,17 @@ module Projects
     private
 
     def success
-      @status.success
-      @project.mark_pages_as_deployed(artifacts_archive: build.job_artifacts_archive)
+      @commit_status.success
+      @project.mark_pages_as_deployed
       super
     end
 
     def error(message)
       register_failure
       log_error("Projects::UpdatePagesService: #{message}")
-      @status.allow_failure = !latest?
-      @status.description = message
-      @status.drop(:script_failure)
+      @commit_status.allow_failure = !latest?
+      @commit_status.description = message
+      @commit_status.drop(:script_failure)
       super
     end
 
diff --git a/db/migrate/20220221102333_change_maintenance_note_limit_in_ci_runner.rb db/migrate/20220221102333_change_maintainer_note_limit_in_ci_runner.rb b/db/migrate/20220221102333_change_maintenance_note_limit_in_ci_runner.rb db/migrate/20220221102333_change_maintainer_note_limit_in_ci_runner.rb
new file mode 100644
index 00000000000..98930691b3b
--- /dev/null
+++ b/db/migrate/20220221102333_change_maintenance_note_limit_in_ci_runner.rb db/migrate/20220221102333_change_maintainer_note_limit_in_ci_runner.rb
@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+class ChangeMaintainerNoteLimitInCiRunner < Gitlab::Database::Migration[1.0]
+  disable_ddl_transaction!
+
+  def up
+    add_text_limit :ci_runners, :maintainer_note, 1024, constraint_name: check_constraint_name(:ci_runners, :maintainer_note, 'max_length_1MB')
+    remove_text_limit :ci_runners, :maintainer_note, constraint_name: check_constraint_name(:ci_runners, :maintainer_note, 'max_length')
+  end
+
+  def down
+    # no-op: Danger of failing if there are records with length(maintainer_note) > 255
+  end
+end
diff --git a/db/post_migrate/20220221214928_remove_show_diff_preview_in_email_column.rb b/db/post_migrate/20220221214928_remove_show_diff_preview_in_email_column.rb
new file mode 100644
index 00000000000..41cd3446c7a
--- /dev/null
+++ b/db/post_migrate/20220221214928_remove_show_diff_preview_in_email_column.rb
@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+class RemoveShowDiffPreviewInEmailColumn < Gitlab::Database::Migration[1.0]
+  enable_lock_retries!
+
+  def up
+    remove_column :project_settings, :show_diff_preview_in_email, :boolean
+  end
+
+  def down
+    add_column :project_settings, :show_diff_preview_in_email, :boolean, default: true, null: false
+  end
+end
diff --git a/db/schema_migrations/20220221102333 b/db/schema_migrations/20220221102333
new file mode 100644
index 00000000000..dfc13fd28a0
--- /dev/null
+++ b/db/schema_migrations/20220221102333
@@ -0,0 +1 @@
+7aa2cf28363e914ad83c61d45321f701a68111122c75abeb54430c4035d56677
\ No newline at end of file
diff --git a/db/schema_migrations/20220221214928 b/db/schema_migrations/20220221214928
new file mode 100644
index 00000000000..5c32b3fbd96
--- /dev/null
+++ b/db/schema_migrations/20220221214928
@@ -0,0 +1 @@
+8c9936d1c0f728c2b40dca536f9edb40f4af94a274ccf1dbec984f218710f695
\ No newline at end of file
diff --git a/db/structure.sql b/db/structure.sql
index e54bf96f887..2abb40b4122 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -12400,7 +12400,7 @@ CREATE TABLE ci_runners (
     executor_type smallint,
     maintainer_note text,
     token_expires_at timestamp with time zone,
-    CONSTRAINT check_56f5ea8804 CHECK ((char_length(maintainer_note) <= 255))
+    CONSTRAINT check_ce275cee06 CHECK ((char_length(maintainer_note) <= 1024))
 );
 
 CREATE SEQUENCE ci_runners_id_seq
@@ -18766,7 +18766,6 @@ CREATE TABLE project_settings (
     merge_commit_template text,
     has_shimo boolean DEFAULT false NOT NULL,
     squash_commit_template text,
-    show_diff_preview_in_email boolean DEFAULT true NOT NULL,
     legacy_open_source_license_available boolean DEFAULT true NOT NULL,
     CONSTRAINT check_3a03e7557a CHECK ((char_length(previous_default_branch) <= 4096)),
     CONSTRAINT check_b09644994b CHECK ((char_length(squash_commit_template) <= 500)),
diff --git a/doc/administration/clusters/kas.md b/doc/administration/clusters/kas.md
index 192b636e246..af31523e875 100644
--- a/doc/administration/clusters/kas.md
+++ b/doc/administration/clusters/kas.md
@@ -4,15 +4,15 @@ group: Configure
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Install the GitLab Agent Server for Kubernetes (KAS) **(FREE SELF)**
+# Install the GitLab agent server for Kubernetes (KAS) **(FREE SELF)**
 
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3834) in GitLab 13.10, the GitLab Agent Server (KAS) became available on GitLab.com under `wss://kas.gitlab.com`.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3834) in GitLab 13.10, the GitLab agent server (KAS) became available on GitLab.com under `wss://kas.gitlab.com`.
 > - [Moved](https://gitlab.com/groups/gitlab-org/-/epics/6290) from GitLab Premium to GitLab Free in 14.5.
 
-The GitLab Agent Server for Kubernetes is a GitLab backend service dedicated to
-managing the [GitLab Agent for Kubernetes](../../user/clusters/agent/index.md).
+The GitLab agent server for Kubernetes is a GitLab backend service dedicated to
+managing the [GitLab agent for Kubernetes](../../user/clusters/agent/index.md).
 
-The KAS acronym refers to the former name, Kubernetes Agent Server.
+The KAS acronym refers to the former name, Kubernetes agent server.
 
 The KAS is already installed and available in GitLab.com under `wss://kas.gitlab.com`.
 This document describes how to install a KAS for GitLab self-managed instances.
@@ -31,7 +31,7 @@ You can also opt to use an [external KAS](#use-an-external-kas-installation).
 
 For [Omnibus](https://docs.gitlab.com/omnibus/) package installations:
 
-1. Edit `/etc/gitlab/gitlab.rb` to enable the Agent Server:
+1. Edit `/etc/gitlab/gitlab.rb` to enable the agent server:
 
    ```ruby
    gitlab_kas['enable'] = true
@@ -96,7 +96,7 @@ For GitLab instances installed through Omnibus packages:
 
 ## Troubleshooting
 
-If you have issues while using the GitLab Agent Server for Kubernetes, view the
+If you have issues while using the GitLab agent server for Kubernetes, view the
 service logs by running the following command:
 
 ```shell
@@ -105,7 +105,7 @@ kubectl logs -f -l=app=kas -n <YOUR-GITLAB-NAMESPACE>
 
 In Omnibus GitLab, find the logs in `/var/log/gitlab/gitlab-kas/`.
 
-You can also [troubleshoot issues with individual Agents](../../user/clusters/agent/troubleshooting.md).
+You can also [troubleshoot issues with individual agents](../../user/clusters/agent/troubleshooting.md).
 
 ### KAS logs - GitOps: failed to get project information
 
diff --git a/doc/administration/logs.md b/doc/administration/logs.md
index c4e9642d048..53ab8061ffa 100644
--- a/doc/administration/logs.md
+++ b/doc/administration/logs.md
@@ -1095,9 +1095,9 @@ For Omnibus GitLab installations, GitLab Monitor logs are in `/var/log/gitlab/gi
 
 For Omnibus GitLab installations, GitLab Exporter logs are in `/var/log/gitlab/gitlab-exporter/`.
 
-## GitLab Agent Server
+## GitLab agent server
 
-For Omnibus GitLab installations, GitLab Agent Server logs are
+For Omnibus GitLab installations, GitLab agent server logs are
 in `/var/log/gitlab/gitlab-kas/`.
 
 ## Praefect Logs
diff --git a/doc/api/jobs.md b/doc/api/jobs.md
index 89018548f5f..53a3216ee5c 100644
--- a/doc/api/jobs.md
+++ b/doc/api/jobs.md
@@ -474,7 +474,7 @@ Example of response
 }
 ```
 
-## Get GitLab Agent by `CI_JOB_TOKEN` **(PREMIUM)**
+## Get GitLab agent by `CI_JOB_TOKEN` **(PREMIUM)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/324269) in GitLab 13.11.
 
diff --git a/doc/api/runners.md b/doc/api/runners.md
index 3423a02c078..393236cd425 100644
--- a/doc/api/runners.md
+++ b/doc/api/runners.md
@@ -660,7 +660,7 @@ POST /runners
 | `access_level`     | string       | no       | The access_level of the runner; `not_protected` or `ref_protected`                                                                                            |
 | `maximum_timeout`  | integer      | no       | Maximum timeout set when this runner handles the job                                                                                                          |
 | `maintainer_note`  | string       | no       | [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/350730), see `maintenance_note`                                                                    |
-| `maintenance_note` | string       | no       | Free-form maintenance notes for the runner (255 characters)                                                                                                   |
+| `maintenance_note` | string       | no       | Free-form maintenance notes for the runner (1024 characters)                                                                                                  |
 
 ```shell
 curl --request POST "https://gitlab.example.com/api/v4/runners" \
diff --git a/doc/api/search.md b/doc/api/search.md
index 2969cf439dd..8c681904e98 100644
--- a/doc/api/search.md
+++ b/doc/api/search.md
@@ -27,7 +27,7 @@ GET /search
 | `order_by`    | string   | no         | Allowed values are `created_at` only. If this is not set, the results are either sorted by `created_at` in descending order for basic search, or by the most relevant documents when using advanced search.|
 | `sort`    | string   | no         | Allowed values are `asc` or `desc` only. If this is not set, the results are either sorted by `created_at` in descending order for basic search, or by the most relevant documents when using advanced search.|
 
-Search the expression within the specified scope. Currently these scopes are supported: projects, issues, merge_requests, milestones, snippet_titles, users.
+Search the expression in the specified scope. These scopes are supported: projects, issues, merge_requests, milestones, snippet_titles, users.
 
 If Elasticsearch is enabled additional scopes available are blobs, wiki_blobs, notes, and commits. Find more about [the feature](../integration/elasticsearch.md). **(PREMIUM)**
 
@@ -344,7 +344,7 @@ Filters are available for this scope:
 - path
 - extension
 
-to use a filter simply include it in your query like so: `a query filename:some_name*`.
+To use a filter, include it in your query. For example: `a query filename:some_name*`.
 
 You may use wildcards (`*`) to use glob matching.
 
@@ -432,7 +432,7 @@ Example response:
 
 ## Group Search API
 
-Search within the specified group.
+Search in the specified group.
 
 If a user is not a member of a group and the group is private, a `GET` request on that group results in a `404` status code.
 
@@ -450,7 +450,7 @@ GET /groups/:id/search
 | `order_by`    | string   | no         | Allowed values are `created_at` only. If this is not set, the results are either sorted by `created_at` in descending order for basic search, or by the most relevant documents when using advanced search.|
 | `sort`    | string   | no         | Allowed values are `asc` or `desc` only. If this is not set, the results are either sorted by `created_at` in descending order for basic search, or by the most relevant documents when using advanced search.|
 
-Search the expression within the specified scope. Currently these scopes are supported: projects, issues, merge_requests, milestones, users.
+Search the expression in the specified scope. These scopes are supported: projects, issues, merge_requests, milestones, users.
 
 If Elasticsearch is enabled additional scopes available are blobs, wiki_blobs, notes, and commits. Find more about [the feature](../integration/elasticsearch.md). **(PREMIUM)**
 
@@ -736,7 +736,7 @@ Filters are available for this scope:
 - path
 - extension
 
-to use a filter simply include it in your query like so: `a query filename:some_name*`.
+To use a filter, include it in your query. For example: `a query filename:some_name*`.
 
 You may use wildcards (`*`) to use glob matching.
 
@@ -824,7 +824,7 @@ Example response:
 
 ## Project Search API
 
-Search within the specified project.
+Search in the specified project.
 
 If a user is not a member of a project and the project is private, a `GET` request on that project results in a `404` status code.
 
@@ -843,7 +843,7 @@ GET /projects/:id/search
 | `order_by`    | string   | no         | Allowed values are `created_at` only. If this is not set, the results are either sorted by `created_at` in descending order for basic search, or by the most relevant documents when using advanced search.|
 | `sort`    | string   | no         | Allowed values are `asc` or `desc` only. If this is not set, the results are either sorted by `created_at` in descending order for basic search, or by the most relevant documents when using advanced search.|
 
-Search the expression within the specified scope. Currently these scopes are supported: issues, merge_requests, milestones, notes, wiki_blobs, commits, blobs, users.
+Search the expression in the specified scope. These scopes are supported: issues, merge_requests, milestones, notes, wiki_blobs, commits, blobs, users.
 
 The response depends on the requested scope.
 
@@ -1065,7 +1065,7 @@ Filters are available for this scope:
 - path
 - extension
 
-To use a filter simply include it in your query like: `a query filename:some_name*`.
+To use a filter, include it in your query. For example: `a query filename:some_name*`.
 You may use wildcards (`*`) to use glob matching.
 
 Wiki blobs searches are performed on both filenames and contents. Search
@@ -1148,7 +1148,7 @@ Filters are available for this scope:
 - path
 - extension
 
-To use a filter simply include it in your query like: `a query filename:some_name*`.
+To use a filter, include it in your query. For example: `a query filename:some_name*`.
 You may use wildcards (`*`) to use glob matching.
 
 Blobs searches are performed on both filenames and contents. Search results:
diff --git a/doc/architecture/blueprints/gitlab_to_kubernetes_communication/index.md b/doc/architecture/blueprints/gitlab_to_kubernetes_communication/index.md
index 754988487de..7039eb4cd02 100644
--- a/doc/architecture/blueprints/gitlab_to_kubernetes_communication/index.md
+++ b/doc/architecture/blueprints/gitlab_to_kubernetes_communication/index.md
@@ -9,7 +9,7 @@ description: 'GitLab to Kubernetes communication'
 # GitLab to Kubernetes communication **(FREE)**
 
 The goal of this document is to define how GitLab can communicate with Kubernetes
-and in-cluster services through the GitLab Agent.
+and in-cluster services through the GitLab agent.
 
 ## Challenges
 
@@ -48,7 +48,7 @@ are stored on the GitLab side and this is yet another security concern for our c
 For more discussion on these issues, read
 [issue #212810](https://gitlab.com/gitlab-org/gitlab/-/issues/212810).
 
-## GitLab Agent epic
+## GitLab agent epic
 
 To address these challenges and provide some new features, the Configure group
 is building an active in-cluster component that inverts the
@@ -62,12 +62,12 @@ The customer does not need to provide any credentials to GitLab, and
 is in full control of what permissions the agent has.
 
 For more information, visit the
-[GitLab Agent repository](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent) or
+[GitLab agent repository](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent) or
 [the epic](https://gitlab.com/groups/gitlab-org/-/epics/3329).
 
 ### Request routing
 
-Agents connect to the server-side component called GitLab Agent Server
+Agents connect to the server-side component called GitLab agent server
 (`gitlab-kas`) and keep an open connection that waits for commands. The
 difficulty with the approach is in routing requests from GitLab to the correct agent.
 Each cluster may contain multiple logical agents, and each may be running as multiple
diff --git a/doc/development/features_inside_dot_gitlab.md b/doc/development/features_inside_dot_gitlab.md
index 283a0d5d5fb..7b11b541b5a 100644
--- a/doc/development/features_inside_dot_gitlab.md
+++ b/doc/development/features_inside_dot_gitlab.md
@@ -12,7 +12,7 @@ When implementing new features, please refer to these existing features to avoid
 - [Custom Dashboards](../operations/metrics/dashboards/index.md#add-a-new-dashboard-to-your-project): `.gitlab/dashboards/`.
 - [Issue Templates](../user/project/description_templates.md#create-an-issue-template): `.gitlab/issue_templates/`.
 - [Merge request Templates](../user/project/description_templates.md#create-a-merge-request-template): `.gitlab/merge_request_templates/`.
-- [GitLab Agent](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/configuration_repository.md#layout): `.gitlab/agents/`.
+- [GitLab agent](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/blob/master/doc/configuration_repository.md#layout): `.gitlab/agents/`.
 - [CODEOWNERS](../user/project/code_owners.md#set-up-code-owners): `.gitlab/CODEOWNERS`.
 - [Route Maps](../ci/review_apps/#route-maps): `.gitlab/route-map.yml`.
 - [Customize Auto DevOps Helm Values](../topics/autodevops/customize.md#customize-values-for-helm-chart): `.gitlab/auto-deploy-values.yaml`.
diff --git a/doc/development/go_guide/go_upgrade.md b/doc/development/go_guide/go_upgrade.md
index 889849799bc..a99253b9723 100644
--- a/doc/development/go_guide/go_upgrade.md
+++ b/doc/development/go_guide/go_upgrade.md
@@ -134,7 +134,7 @@ if you need help finding the correct person or labels:
 | GitLab Compose Kit            | [Issuer Tracker](https://gitlab.com/gitlab-org/gitlab-compose-kit/-/issues) |
 | GitLab Container Registry     | [Issue Tracker](https://gitlab.com/gitlab-org/container-registry) |
 | GitLab Elasticsearch Indexer  | [Issue Tracker](https://gitlab.com/gitlab-org/gitlab-elasticsearch-indexer/-/issues) |
-| GitLab Agent Server (KAS) | [Issue Tracker](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/issues) |
+| GitLab agent server for Kubernetes (KAS) | [Issue Tracker](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/issues) |
 | GitLab Pages                  | [Issue Tracker](https://gitlab.com/gitlab-org/gitlab-pages/-/issues) |
 | GitLab Quality Images         | [Issue Tracker](https://gitlab.com/gitlab-org/gitlab-build-images/-/issues) |
 | GitLab Shell                  | [Issue Tracker](https://gitlab.com/gitlab-org/gitlab-shell/-/issues) |
diff --git a/doc/development/internal_api/index.md b/doc/development/internal_api/index.md
index db978253747..f7eb4cb60c1 100644
--- a/doc/development/internal_api/index.md
+++ b/doc/development/internal_api/index.md
@@ -42,7 +42,7 @@ file, and include the token Base64 encoded in a `secret_token` parameter
 or in the `Gitlab-Shared-Secret` header.
 
 NOTE:
-The internal API used by GitLab Pages, and GitLab Agent Server (`kas`) uses JSON Web Token (JWT)
+The internal API used by GitLab Pages, and GitLab agent server (`kas`) uses JSON Web Token (JWT)
 authentication, which is different from GitLab Shell.
 
 ## Git Authentication
@@ -400,13 +400,13 @@ Example response:
 }
 ```
 
-## GitLab Agent endpoints
+## GitLab agent endpoints
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/41045) in GitLab 13.4.
 > - This feature is not deployed on GitLab.com
 > - It's not recommended for production use.
 
-The following endpoints are used by the GitLab Agent Server (`kas`)
+The following endpoints are used by the GitLab agent server (`kas`)
 for various purposes.
 
 These endpoints are all authenticated using JWT. The JWT secret is stored in a file
@@ -414,11 +414,11 @@ specified in `config/gitlab.yml`. By default, the location is in the root of the
 GitLab Rails app in a file called `.gitlab_kas_secret`.
 
 WARNING:
-The GitLab Agent is under development and is not recommended for production use.
+The GitLab agent is under development and is not recommended for production use.
 
-### GitLab Agent information
+### GitLab agent information
 
-Called from GitLab Agent Server (`kas`) to retrieve agent
+Called from GitLab agent server (`kas`) to retrieve agent
 information for the given agent token. This returns the Gitaly connection
 information for the agent's project in order for `kas` to fetch and update
 the agent's configuration.
@@ -434,9 +434,9 @@ curl --request GET --header "Gitlab-Kas-Api-Request: <JWT token>" \
      --header "Authorization: Bearer <agent token>" "http://localhost:3000/api/v4/internal/kubernetes/agent_info"
 ```
 
-### GitLab Agent project information
+### GitLab agent project information
 
-Called from GitLab Agent Server (`kas`) to retrieve project
+Called from GitLab agent server (`kas`) to retrieve project
 information for the given agent token. This returns the Gitaly
 connection for the requested project. GitLab `kas` uses this to configure
 the agent to fetch Kubernetes resources from the project repository to
@@ -460,9 +460,9 @@ curl --request GET --header "Gitlab-Kas-Api-Request: <JWT token>" \
      --header "Authorization: Bearer <agent token>" "http://localhost:3000/api/v4/internal/kubernetes/project_info?id=7"
 ```
 
-### GitLab Agent usage metrics
+### GitLab agent usage metrics
 
-Called from GitLab Agent Server (`kas`) to increase the usage
+Called from GitLab agent server (`kas`) to increase the usage
 metric counters.
 
 | Attribute | Type   | Required | Description |
@@ -481,9 +481,9 @@ curl --request POST --header "Gitlab-Kas-Api-Request: <JWT token>" --header "Con
      --data '{"gitops_sync_count":1}' "http://localhost:3000/api/v4/internal/kubernetes/usage_metrics"
 ```
 
-### GitLab Agent alert metrics
+### GitLab agent alert metrics
 
-Called from GitLab Agent Server (KAS) to save alerts derived from Cilium on Kubernetes
+Called from GitLab agent server (KAS) to save alerts derived from Cilium on Kubernetes
 Cluster.
 
 | Attribute | Type   | Required | Description |
@@ -505,7 +505,7 @@ curl --request POST --header "Gitlab-Kas-Api-Request: <JWT token>" \
 
 ### Create Starboard vulnerability
 
-Called from the GitLab Agent Server (`kas`) to create a security vulnerability
+Called from the GitLab agent server (`kas`) to create a security vulnerability
 from a Starboard vulnerability report. This request is idempotent. Multiple requests with the same data
 create a single vulnerability. The response contains the UUID of the created vulnerability finding.
 
@@ -563,7 +563,7 @@ Example response:
 
 ### Resolve Starboard vulnerabilities
 
-Called from the GitLab Agent Server (`kas`) to resolve Starboard security vulnerabilities.
+Called from the GitLab agent server (`kas`) to resolve Starboard security vulnerabilities.
 Accepts a list of finding UUIDs and marks all Starboard vulnerabilities not identified by
 the list as resolved.
 
diff --git a/doc/install/openshift_and_gitlab/index.md b/doc/install/openshift_and_gitlab/index.md
index e102235c4f0..99a7cd12767 100644
--- a/doc/install/openshift_and_gitlab/index.md
+++ b/doc/install/openshift_and_gitlab/index.md
@@ -20,7 +20,7 @@ Some components (documented on the GitLab Operator doc) are not supported yet.
 
 ## Deploy to and integrate with OpenShift from GitLab
 
-Deploying custom or COTS applications on top of OpenShift from GitLab is supported using [the GitLab Agent](../../user/clusters/agent/index.md).
+Deploying custom or COTS applications on top of OpenShift from GitLab is supported using [the GitLab agent](../../user/clusters/agent/index.md).
 
 ## Use OpenShift to run a GitLab Runner Fleet
 
diff --git a/doc/topics/autodevops/index.md b/doc/topics/autodevops/index.md
index 585d484d3be..8410fd8b31d 100644
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Auto DevOps **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab-foss/-/issues/38366) in GitLab 11.0.
-> - Support for the GitLab Agent was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299350) in GitLab 14.5.
+> - Support for the GitLab agent was [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/299350) in GitLab 14.5.
 
 GitLab Auto DevOps is a collection of pre-configured features and integrations
 that work together to support your software delivery process.
diff --git a/doc/topics/autodevops/stages.md b/doc/topics/autodevops/stages.md
index 8b3966526ec..1f3fa3394ea 100644
--- a/doc/topics/autodevops/stages.md
+++ b/doc/topics/autodevops/stages.md
@@ -659,7 +659,7 @@ ciliumNetworkPolicy:
 #### Enabling Alerts
 
 You can also enable alerts. Network policies with alerts are considered only if
-[Agent](../../user/clusters/agent/index.md)
+the [agent](../../user/clusters/agent/index.md)
 has been integrated.
 
 You can enable alerts as follows:
diff --git a/doc/topics/release_your_application.md b/doc/topics/release_your_application.md
index 8fd4606c375..c0fb3652d81 100644
--- a/doc/topics/release_your_application.md
+++ b/doc/topics/release_your_application.md
@@ -26,17 +26,17 @@ deployment using GitLab CI/CD.
 ### Deploy applications to Kubernetes clusters
 
 With the extensive integration between GitLab and Kubernetes, you can safely deploy your applications
-to Kubernetes clusters using the [GitLab Agent](../user/clusters/agent/install/index.md).
+to Kubernetes clusters using the [GitLab agent](../user/clusters/agent/install/index.md).
 
 #### GitOps deployments **(PREMIUM)**
 
-With the [GitLab Agent](../user/clusters/agent/install/index.md), you can perform [pull-based
+With the [GitLab agent](../user/clusters/agent/install/index.md), you can perform [pull-based
 deployments of Kubernetes manifests](../user/clusters/agent/gitops.md). This provides a scalable, secure, and cloud-native
 approach to manage Kubernetes deployments.
 
 #### Deploy to Kubernetes with the CI/CD Tunnel
 
-With the [GitLab Agent](../user/clusters/agent/install/index.md), you can perform push-based
+With the [GitLab agent](../user/clusters/agent/install/index.md), you can perform push-based
 deployments with the [CI/CD Tunnel](../user/clusters/agent/ci_cd_tunnel.md). It provides
 a secure and reliable connection between GitLab and your Kubernetes cluster.
 
diff --git a/doc/user/application_security/cluster_image_scanning/index.md b/doc/user/application_security/cluster_image_scanning/index.md
index 8b29da06b57..8bf0efd5261 100644
--- a/doc/user/application_security/cluster_image_scanning/index.md
+++ b/doc/user/application_security/cluster_image_scanning/index.md
@@ -29,7 +29,7 @@ To integrate GitLab with security scanners other than those listed here, see
 You can use cluster image scanning through the following methods:
 
 - [The cluster image scanning analyzer](#use-the-cluster-image-scanning-analyzer)
-- [The GitLab Agent](#cluster-image-scanning-with-the-gitlab-agent)
+- [The GitLab agent](#cluster-image-scanning-with-the-gitlab-agent)
 
 ## Use the cluster image scanning analyzer
 
@@ -277,22 +277,22 @@ Here's an example cluster image scanning report:
 }
 ```
 
-## Cluster image scanning with the GitLab Agent
+## Cluster image scanning with the GitLab agent
 
-You can use the [GitLab Agent](../../clusters/agent/index.md) to
+You can use the [GitLab agent](../../clusters/agent/index.md) to
 scan images from within your Kubernetes cluster and record the vulnerabilities in GitLab.
 
 ### Prerequisites
 
 - [Starboard Operator](https://aquasecurity.github.io/starboard/v0.10.3/operator/installation/kubectl/)
   installed and configured in your cluster.
-- [GitLab Agent](../../clusters/agent/install/index.md)
+- [GitLab agent](../../clusters/agent/install/index.md)
   set up in GitLab, installed in your cluster, and configured using a configuration repository.
 
 ### Configuration
 
-The Agent runs the cluster image scanning once the `cluster_image_scanning`
-directive is added to your [Agent's configuration repository](../../clusters/agent/vulnerabilities.md).
+The agent runs the cluster image scanning once the `cluster_image_scanning`
+directive is added to your [agent's configuration repository](../../clusters/agent/vulnerabilities.md).
 
 ## Security Dashboard
 
@@ -302,7 +302,7 @@ the security vulnerabilities in your groups, projects, and pipelines.
 ## Interacting with the vulnerabilities
 
 After you find a vulnerability, you can address it in the [vulnerability report](../vulnerabilities/index.md)
-or the [GitLab Agent's](../../clusters/agent/vulnerabilities.md)
+or the [GitLab agent's](../../clusters/agent/vulnerabilities.md)
 details section.
 
 ## Troubleshooting
diff --git a/doc/user/clusters/agent/index.md b/doc/user/clusters/agent/index.md
index bf7ec9c2a4e..6d3151434cc 100644
--- a/doc/user/clusters/agent/index.md
+++ b/doc/user/clusters/agent/index.md
@@ -8,7 +8,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/223061) in GitLab 13.4.
 > - Support for `grpcs` [introduced](https://gitlab.com/gitlab-org/cluster-integration/gitlab-agent/-/issues/7) in GitLab 13.6.
-> - Agent Server [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/300960) on GitLab.com under `wss://kas.gitlab.com` through an Early Adopter Program in GitLab 13.10.
+> - Agent server [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/300960) on GitLab.com under `wss://kas.gitlab.com` through an Early Adopter Program in GitLab 13.10.
 > - The agent became available to every project on GitLab.com in GitLab 13.11.
 > - [Moved](https://gitlab.com/groups/gitlab-org/-/epics/6290) from GitLab Premium to GitLab Free in 14.5.
 > - [Renamed](https://gitlab.com/groups/gitlab-org/-/epics/7167) from "GitLab Kubernetes Agent" to "GitLab agent for Kubernetes" in GitLab 14.6.
diff --git a/doc/user/clusters/agent/repository.md b/doc/user/clusters/agent/repository.md
index bf778cc0fdc..11555f368da 100644
--- a/doc/user/clusters/agent/repository.md
+++ b/doc/user/clusters/agent/repository.md
@@ -7,7 +7,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Working with the agent for Kubernetes **(FREE)**
 
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/259669) in GitLab 13.7.
-> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3834) in GitLab 13.11, the GitLab Agent became available on GitLab.com.
+> - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/3834) in GitLab 13.11, the GitLab agent became available on GitLab.com.
 > - [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/5784) the `ci_access` attribute in GitLab 14.3.
 > - [Moved](https://gitlab.com/groups/gitlab-org/-/epics/6290) from GitLab Premium to GitLab Free in 14.5.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/332227) in GitLab 14.0, the `resource_inclusions` and `resource_exclusions` attributes were removed and `reconcile_timeout`, `dry_run_strategy`, `prune`, `prune_timeout`, `prune_propagation_policy`, and `inventory_policy` attributes were added.
diff --git a/doc/user/clusters/agent/troubleshooting.md b/doc/user/clusters/agent/troubleshooting.md
index 2fcf0c9aa98..a5e568837ad 100644
--- a/doc/user/clusters/agent/troubleshooting.md
+++ b/doc/user/clusters/agent/troubleshooting.md
@@ -4,9 +4,9 @@ group: Configure
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/engineering/ux/technical-writing/#assignments
 ---
 
-# Troubleshooting the GitLab Agent for Kubernetes
+# Troubleshooting the GitLab agent for Kubernetes
 
-When you are using the GitLab Agent for Kubernetes, you might experience issues you need to troubleshoot.
+When you are using the GitLab agent for Kubernetes, you might experience issues you need to troubleshoot.
 
 You can start by viewing the service logs:
 
@@ -14,7 +14,7 @@ You can start by viewing the service logs:
 kubectl logs -f -l=app=gitlab-agent -n gitlab-kubernetes-agent
 ```
 
-If you are a GitLab administrator, you can also view the [GitLab Agent Server logs](../../../administration/clusters/kas.md#troubleshooting).
+If you are a GitLab administrator, you can also view the [GitLab agent server logs](../../../administration/clusters/kas.md#troubleshooting).
 
 ## Transport: Error while dialing failed to WebSocket dial
 
@@ -28,7 +28,7 @@ If you are a GitLab administrator, you can also view the [GitLab Agent Server lo
 ```
 
 This error is shown if there are some connectivity issues between the address
-specified as `kas-address`, and your Agent pod. To fix it, make sure that you
+specified as `kas-address`, and your agent pod. To fix it, make sure that you
 specified the `kas-address` correctly.
 
 ```json
@@ -189,4 +189,4 @@ Alternatively, you can mount the certificate file at a different location and in
 ```
 
 This error is shown if the manifest project is not public. To fix it, make sure your manifest project is public or your manifest files
-are stored in the Agent's configuration repository.
+are stored in the agent's configuration repository.
diff --git a/doc/user/clusters/integrations.md b/doc/user/clusters/integrations.md
index ee7452537fd..43a35177d28 100644
--- a/doc/user/clusters/integrations.md
+++ b/doc/user/clusters/integrations.md
@@ -32,9 +32,9 @@ to automate this step.
 
 Prometheus and Elastic Stack cluster integrations can only be enabled for clusters [connected through cluster certificates](../project/clusters/add_existing_cluster.md).
 
-To enable Prometheus for your cluster connected through the [GitLab Agent](agent/index.md), you can [integrate it manually](../project/integrations/prometheus.md#manual-configuration-of-prometheus).
+To enable Prometheus for your cluster connected through the [GitLab agent](agent/index.md), you can [integrate it manually](../project/integrations/prometheus.md#manual-configuration-of-prometheus).
 
-There is no option to enable Elastic Stack for your cluster if it is connected with the GitLab Agent.
+There is no option to enable Elastic Stack for your cluster if it is connected with the GitLab agent.
 Follow this [issue](https://gitlab.com/gitlab-org/gitlab/-/issues/300230) for updates.
 
 ## Prometheus cluster integration
@@ -44,7 +44,7 @@ Follow this [issue](https://gitlab.com/gitlab-org/gitlab/-/issues/300230) for up
 WARNING:
 This feature was [deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5. However, you can **still use** Prometheus
 for Kubernetes clusters connected to GitLab through the
-[Agent](agent/index.md) by [enabling Prometheus manually](../project/integrations/prometheus.md#manual-configuration-of-prometheus).
+[agent](agent/index.md) by [enabling Prometheus manually](../project/integrations/prometheus.md#manual-configuration-of-prometheus).
 
 You can integrate your Kubernetes cluster with
 [Prometheus](https://prometheus.io/) for monitoring key metrics of your
diff --git a/doc/user/clusters/management_project.md b/doc/user/clusters/management_project.md
index e28f9275b50..7658bc41dd9 100644
--- a/doc/user/clusters/management_project.md
+++ b/doc/user/clusters/management_project.md
@@ -11,7 +11,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 WARNING:
 The cluster management project was [deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5.
-To manage cluster applications, use the [GitLab Agent](agent/index.md)
+To manage cluster applications, use the [GitLab agent](agent/index.md)
 with the [Cluster Management Project Template](management_project_template.md).
 
 A project can be designated as the management project for a cluster.
diff --git a/doc/user/clusters/management_project_template.md b/doc/user/clusters/management_project_template.md
index af82c166dcb..93af5849fcb 100644
--- a/doc/user/clusters/management_project_template.md
+++ b/doc/user/clusters/management_project_template.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/-/merge_requests/25318) in GitLab 12.10 with Helmfile support via Helm v2.
 > - Helm v2 support was [dropped](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/63577) in GitLab 14.0. Use Helm v3 instead.
-> - [Migrated](https://gitlab.com/gitlab-org/project-templates/cluster-management/-/merge_requests/24) to the GitLab Agent in GitLab 14.5.
+> - [Migrated](https://gitlab.com/gitlab-org/project-templates/cluster-management/-/merge_requests/24) to the GitLab agent in GitLab 14.5.
 
 Use a repository to install, manage, and deploy clusters applications through code.
 
@@ -31,45 +31,45 @@ you can manage cluster applications with [Helm v3](https://helm.sh/).
 - An `applications` directory with a `helmfile.yaml` configured for each
 application available in the template.
 
-## Use the Agent with the Cluster Management Project Template
+## Use the agent with the Cluster Management Project Template
 
 To use a new project created from the Cluster Management Project Template
-with a cluster connected to GitLab through the [GitLab Agent](agent/index.md),
+with a cluster connected to GitLab through the [GitLab agent](agent/index.md),
 you have two options:
 
-- [Use one single project](#single-project) to configure the Agent and manage cluster applications.
-- [Use separate projects](#separate-projects) - one to configure the Agent and another to manage cluster applications.
+- [Use one single project](#single-project) to configure the agent and manage cluster applications.
+- [Use separate projects](#separate-projects) - one to configure the agent and another to manage cluster applications.
 
 ### Single project
 
 This setup is particularly useful when you haven't connected your cluster
-to GitLab through the Agent yet and you want to use the Cluster Management
+to GitLab through the agent yet and you want to use the Cluster Management
 Project Template to manage cluster applications.
 
-To use one single project to configure the Agent and to manage cluster applications:
+To use one single project to configure the agent and to manage cluster applications:
 
 1. [Create a new project from the Cluster Management Project Template](#create-a-new-project-based-on-the-cluster-management-template).
-1. Configure the new project as the [Agent's configuration repository](agent/repository.md)
-(where the Agent is registered and its `config.yaml` is stored).
+1. Configure the new project as the [agent's configuration repository](agent/repository.md)
+(where the agent is registered and its `config.yaml` is stored).
 1. From your project's settings, add a [new environment variable](../../ci/variables/index.md#add-a-cicd-variable-to-a-project) `$KUBE_CONTEXT` and set it to `path/to/agent-configuration-project:your-agent-name`.
 1. [Configure the components](#configure-the-available-components) inherited from the template.
 
 ### Separate projects
 
 This setup is particularly useful **when you already have a cluster** connected
-to GitLab through the Agent and want to use the Cluster Management
+to GitLab through the agent and want to use the Cluster Management
 Project Template to manage cluster applications.
 
-To use one project to configure the Agent ("project A") and another project to
+To use one project to configure the agent ("project A") and another project to
 manage cluster applications ("project B"), follow the steps below.
 
-We assume that you already have a cluster connected through the Agent and
-[configured through the Agent's configuration repository](agent/repository.md)
+We assume that you already have a cluster connected through the agent and
+[configured through the agent's configuration repository](agent/repository.md)
 ("project A").
 
 1. [Create a new project from the Cluster Management Project Template](#create-a-new-project-based-on-the-cluster-management-template).
 This new project is "project B".
-1. In your "project A", [grant the Agent access to the new project (B) through the CI/CD Tunnel](agent/ci_cd_tunnel.md#authorize-the-agent).
+1. In your "project A", [grant the agent access to the new project (B) through the CI/CD Tunnel](agent/ci_cd_tunnel.md#authorize-the-agent).
 1. From the "project's B" settings, add a [new environment variable](../../ci/variables/index.md#add-a-cicd-variable-to-a-project) `$KUBE_CONTEXT` and set it to `path/to/agent-configuration-project:your-agent-name`.
 1. In "project B", [configure the components](#configure-the-available-components) inherited from the template.
 
diff --git a/doc/user/group/clusters/index.md b/doc/user/group/clusters/index.md
index b2b16321488..0da7eaa4d55 100644
--- a/doc/user/group/clusters/index.md
+++ b/doc/user/group/clusters/index.md
@@ -12,7 +12,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 WARNING:
 This feature was [deprecated](https://gitlab.com/groups/gitlab-org/configure/-/epics/8) in GitLab 14.5. To connect clusters to GitLab,
-use the [GitLab Agent](../../clusters/agent/index.md).
+use the [GitLab agent](../../clusters/agent/index.md).
 
 Similar to [project-level](../../project/clusters/index.md) and
 [instance-level](../../instance/clusters/index.md) Kubernetes clusters,
diff --git a/doc/user/group/roadmap/index.md b/doc/user/group/roadmap/index.md
index f10dc3bc22a..64cead7642f 100644
--- a/doc/user/group/roadmap/index.md
+++ b/doc/user/group/roadmap/index.md
@@ -24,12 +24,12 @@ When you hover over an epic bar, a popover appears with the epic's title, start
 weight completed.
 
 You can expand epics that contain child epics to show their child epics in the roadmap.
-You can click the chevron (**{chevron-down}**) next to the epic title to expand and collapse the
+You can select the chevron (**{chevron-down}**) next to the epic title to expand and collapse the
 child epics.
 
 On top of the milestone bars, you can see their title.
 When you hover over a milestone bar or title, a popover appears with its title, start date, and due
-date. You can also click the chevron (**{chevron-down}**) next to the **Milestones** heading to
+date. You can also select the chevron (**{chevron-down}**) next to the **Milestones** heading to
 toggle the list of the milestone bars.
 
 ![roadmap view](img/roadmap_view_v14_3.png)
@@ -47,9 +47,9 @@ Filtering roadmaps by milestone might not be available to you. Check the **versi
 When you want to explore a roadmap, there are several ways to make it easier by sorting epics or
 filtering them by what's important for you.
 
-A dropdown menu lets you show only open or closed epics. By default, all epics are shown.
+A dropdown list lets you show only open or closed epics. By default, all epics are shown.
 
-![epics state dropdown](img/epics_state_dropdown_v14_3.png)
+![epics state dropdown list](img/epics_state_dropdown_v14_3.png)
 
 You can sort epics in the Roadmap view by:
 
@@ -85,7 +85,7 @@ When you enable the roadmap settings sidebar, you can use it to refine epics sho
 You can configure the following:
 
 - Select date range.
-- Turn milestones on or off and select whether to show all, group, sub-group, or project milestones.
+- Turn milestones on or off and select whether to show all, group, subgroup, or project milestones.
 - Show all, open, or closed epics.
 - Turn progress tracking for child issues on or off and select whether
   to use issue weights or counts.
diff --git a/doc/user/infrastructure/clusters/index.md b/doc/user/infrastructure/clusters/index.md
index 06122b85c98..5f9cc2e2f5f 100644
--- a/doc/user/infrastructure/clusters/index.md
+++ b/doc/user/infrastructure/clusters/index.md
@@ -6,7 +6,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Kubernetes clusters **(FREE)**
 
-To connect clusters to GitLab, use the [GitLab Agent](../../clusters/agent/index.md).
+To connect clusters to GitLab, use the [GitLab agent](../../clusters/agent/index.md).
 
 ## Certificate-based Kubernetes integration (DEPRECATED)
 
@@ -24,7 +24,7 @@ It had the following issues:
 - Users were constantly reporting issues with features based on this model.
 
 For this reason, we started to build features based on a new model, the
-[GitLab Agent](../../clusters/agent/index.md).
+[GitLab agent](../../clusters/agent/index.md).
 Maintaining both methods in parallel caused a lot of confusion
 and significantly increased the complexity to use, develop, maintain, and
 document them. For this reason, we decided to deprecate them to focus on the
@@ -38,7 +38,7 @@ Follow this [epic](https://gitlab.com/groups/gitlab-org/configure/-/epics/8)
 for updates.
 
 You can find technical information about why we moved away from cluster certificates into
-the GitLab Agent model on the [Agent's blueprint documentation](../../../architecture/blueprints/gitlab_to_kubernetes_communication/index.md).
+the GitLab agent model on the [agent's blueprint documentation](../../../architecture/blueprints/gitlab_to_kubernetes_communication/index.md).
 
 ## Deprecated features
 
@@ -67,6 +67,6 @@ The concept of [project-level](../../project/clusters/index.md),
 [instance-level](../../instance/clusters/index.md) clusters becomes
 extinct in the new model, although the functionality remains to some extent.
 
-The Agent is always configured in a single GitLab project, but you can use the CI/CD Tunnel to
-authorize other projects and groups to use the same Agent.
+The agent is always configured in a single GitLab project, but you can use the CI/CD Tunnel to
+authorize other projects and groups to use the same agent.
 By doing so, you are granting these projects and groups access to the same cluster, which is similar to group-level clusters' use case.
diff --git a/doc/user/infrastructure/index.md b/doc/user/infrastructure/index.md
index d8e75928675..73e57ea3d59 100644
--- a/doc/user/infrastructure/index.md
+++ b/doc/user/infrastructure/index.md
@@ -30,11 +30,11 @@ Learn more about how GitLab can help you run [Infrastructure as Code](iac/index.
 ## Integrated Kubernetes management
 
 The GitLab integration with Kubernetes helps you to install, configure, manage, deploy, and troubleshoot
-cluster applications. With the GitLab Agent, you can connect clusters behind a firewall,
+cluster applications. With the GitLab agent, you can connect clusters behind a firewall,
 have real-time access to API endpoints, perform pull-based or push-based deployments for production
 and non-production environments, and much more.
 
-Learn more about the [GitLab Agent](../clusters/agent/index.md).
+Learn more about the [GitLab agent](../clusters/agent/index.md).
 
 ## Runbooks in GitLab
 
diff --git a/doc/user/project/canary_deployments.md b/doc/user/project/canary_deployments.md
index 77cf04cc7eb..0e60d0d88bc 100644
--- a/doc/user/project/canary_deployments.md
+++ b/doc/user/project/canary_deployments.md
@@ -35,7 +35,7 @@ your pods fleet and watch their behavior as a percentage of your user base
 visits the temporarily deployed feature. If all works well, you can deploy the
 feature to production knowing that it shouldn't cause any problems.
 
-Canary deployments are also especially useful for backend refactors, performance
+Canary deployments are also especially required for backend refactors, performance
 improvements, or other changes where the user interface doesn't change, but you
 want to make sure the performance stays the same, or improves. Developers need
 to be careful when using canaries with user-facing changes, because by default,
@@ -50,7 +50,7 @@ this document.
 Canary deployments require that you properly configure deploy boards:
 
 1. Follow the steps to [enable deploy boards](deploy_boards.md#enabling-deploy-boards).
-1. To track canary deployments you need to label your Kubernetes deployments and
+1. To track canary deployments you must label your Kubernetes deployments and
    pods with `track: canary`. To get started quickly, you can use the [Auto Deploy](../../topics/autodevops/stages.md#auto-deploy)
    template for canary deployments that GitLab provides.
 
@@ -60,12 +60,12 @@ Any other track label is considered `canary` (temporary).
 This allows GitLab to discover whether a deployment is stable or canary (temporary).
 
 Once all of the above are set up and the pipeline has run at least once,
-navigate to the environments page under **Pipelines > Environments**.
+Go to the environments page under **Pipelines > Environments**.
 As the pipeline executes, deploy boards clearly mark canary pods, enabling
-quick and easy insight into the status of each environment and deployment.
+quick and clear insight into the status of each environment and deployment.
 
 Canary deployments are marked with a yellow dot in the deploy board so that you
-can easily notice them.
+can quickly notice them.
 
 ![Canary deployments on deploy board](img/deploy_boards_canary_deployments.png)
 
@@ -82,7 +82,7 @@ Canary deployments can be more strategic with [Canary Ingress](https://kubernete
 which is an advanced traffic routing service that controls incoming HTTP
 requests between stable and canary deployments based on factors such as weight, sessions, cookies,
 and others. GitLab uses this service in its [Auto Deploy architecture](../../topics/autodevops/upgrading_auto_deploy_dependencies.md#v2-chart-resource-architecture)
-to let users easily and safely roll out their new deployments.
+to let users quickly and safely roll out their new deployments.
 
 #### How to set up a Canary Ingress in a canary deployment
 
@@ -115,13 +115,13 @@ Here's an example setup flow from scratch:
 
 #### How to change the traffic weight on a Canary Ingress
 
-You can change the traffic weight within your environment's deploy board by using [GraphiQL](../../api/graphql/getting_started.md#graphiql),
+You can change the traffic weight in your environment's deploy board by using [GraphiQL](../../api/graphql/getting_started.md#graphiql),
 or by sending requests to the [GraphQL API](../../api/graphql/getting_started.md#command-line).
 
 To use your [deploy board](../../user/project/deploy_boards.md):
 
-1. Navigate to **Deployments > Environments** for your project.
-1. Set the new weight with the dropdown on the right side.
+1. Go to **Deployments > Environments** for your project.
+1. Set the new weight with the dropdown list on the right side.
 1. Confirm your selection.
 
 Here's an example using [GraphiQL](../../api/graphql/getting_started.md#graphiql):
diff --git a/spec/models/project_pages_metadatum_spec.rb b/spec/models/project_pages_metadatum_spec.rb
index af2f9b94871..31a533e0363 100644
--- a/spec/models/project_pages_metadatum_spec.rb
+++ b/spec/models/project_pages_metadatum_spec.rb
@@ -18,15 +18,4 @@ RSpec.describe ProjectPagesMetadatum do
       expect(described_class.only_on_legacy_storage).to eq([legacy_storage_project.pages_metadatum])
     end
   end
-
-  it_behaves_like 'cleanup by a loose foreign key' do
-    let!(:model) do
-      artifacts_archive = create(:ci_job_artifact, :legacy_archive)
-      metadatum = artifacts_archive.project.pages_metadatum
-      metadatum.artifacts_archive = artifacts_archive
-      metadatum
-    end
-
-    let!(:parent) { model.artifacts_archive }
-  end
 end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index c0687a7a116..0248f55bd6e 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -6559,7 +6559,6 @@ RSpec.describe Project, factory_default: :keep do
 
   describe '#mark_pages_as_deployed' do
     let(:project) { create(:project) }
-    let(:artifacts_archive) { create(:ci_job_artifact, project: project) }
 
     it "works when artifacts_archive is missing" do
       project.mark_pages_as_deployed
@@ -6571,7 +6570,7 @@ RSpec.describe Project, factory_default: :keep do
       project.pages_metadatum.destroy!
       project.reload
 
-      project.mark_pages_as_deployed(artifacts_archive: artifacts_archive)
+      project.mark_pages_as_deployed
 
       expect(project.pages_metadatum.reload.deployed).to eq(true)
     end
@@ -6581,15 +6580,13 @@ RSpec.describe Project, factory_default: :keep do
       pages_metadatum.update!(deployed: false)
 
       expect do
-        project.mark_pages_as_deployed(artifacts_archive: artifacts_archive)
+        project.mark_pages_as_deployed
       end.to change { pages_metadatum.reload.deployed }.from(false).to(true)
-               .and change { pages_metadatum.reload.artifacts_archive }.from(nil).to(artifacts_archive)
     end
   end
 
   describe '#mark_pages_as_not_deployed' do
     let(:project) { create(:project) }
-    let(:artifacts_archive) { create(:ci_job_artifact, project: project) }
 
     it "creates new record and sets deployed to false if none exists yet" do
       project.pages_metadatum.destroy!
@@ -6602,12 +6599,11 @@ RSpec.describe Project, factory_default: :keep do
 
     it "updates the existing record and sets deployed to false and clears artifacts_archive" do
       pages_metadatum = project.pages_metadatum
-      pages_metadatum.update!(deployed: true, artifacts_archive: artifacts_archive)
+      pages_metadatum.update!(deployed: true)
 
       expect do
         project.mark_pages_as_not_deployed
       end.to change { pages_metadatum.reload.deployed }.from(true).to(false)
-               .and change { pages_metadatum.reload.artifacts_archive }.from(artifacts_archive).to(nil)
     end
   end
 
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index 5810024a1ef..6407b8d3940 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -39,7 +39,6 @@ RSpec.describe Projects::UpdatePagesService do
         expect(project.pages_deployed?).to be_falsey
         expect(execute).to eq(:success)
         expect(project.pages_metadatum).to be_deployed
-        expect(project.pages_metadatum.artifacts_archive).to eq(artifacts_archive)
         expect(project.pages_deployed?).to be_truthy
       end