Add latest changes from gitlab-org/gitlab@master

17 files changed, 179 insertions, 197 deletions

diff --git a/.rubocop_todo/layout/space_inside_parens.yml b/.rubocop_todo/layout/space_inside_parens.yml
index 50511bbb1e3..599f041dc91 100644
--- a/.rubocop_todo/layout/space_inside_parens.yml
+++ b/.rubocop_todo/layout/space_inside_parens.yml
@@ -29,24 +29,6 @@ Layout/SpaceInsideParens:
     - 'ee/spec/frontend/fixtures/analytics/devops_reports/devops_adoption/enabled_namespaces.rb'
     - 'ee/spec/frontend/fixtures/epic.rb'
     - 'ee/spec/frontend/fixtures/projects.rb'
-    - 'ee/spec/lib/ee/gitlab/background_migration/drop_invalid_remediations_spec.rb'
-    - 'ee/spec/lib/ee/gitlab/usage_data_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/auth_hash_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/dynamic_settings_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/group_saml/group_lookup_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/otp/session_enforcer_spec.rb'
-    - 'ee/spec/lib/gitlab/auth/smartcard/ldap_certificate_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/coverage_fuzzing_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_api_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_api_latest_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_latest_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/dast_runner_validation_gitlab_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/ci/templates/secure_binaries_ci_yaml_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/git_ssh_proxy_spec.rb'
-    - 'ee/spec/lib/gitlab/geo/log_cursor/events/event_spec.rb'
-    - 'ee/spec/lib/gitlab/graphql/aggregations/epics/lazy_epic_aggregate_spec.rb'
-    - 'ee/spec/lib/gitlab/status_page/storage/s3_client_spec.rb'
     - 'ee/spec/mailers/notify_spec.rb'
     - 'ee/spec/migrations/add_non_null_constraint_for_escalation_rule_on_pending_alert_escalations_spec.rb'
     - 'ee/spec/migrations/drop_invalid_remediations_spec.rb'
diff --git a/Gemfile b/Gemfile
index 6ea3242653a..91f0c5f3336 100644
--- a/Gemfile
+++ b/Gemfile
@@ -340,7 +340,7 @@ gem 'pg_query', '~> 2.1.4'
 gem 'premailer-rails', '~> 1.10.3'
 
 # LabKit: Tracing and Correlation
-gem 'gitlab-labkit', '~> 0.26.0'
+gem 'gitlab-labkit', '~> 0.27.0'
 gem 'thrift', '>= 0.16.0'
 
 # I18n
diff --git a/Gemfile.checksum b/Gemfile.checksum
index f8b12ab681b..ab35a36a185 100644
--- a/Gemfile.checksum
+++ b/Gemfile.checksum
@@ -205,7 +205,7 @@
 {"name":"gitlab-dangerfiles","version":"3.6.1","platform":"ruby","checksum":"f7b69b093d52acb89095d411cb7b8849f5f3b9e76f8baa4c99b5671f1564865f"},
 {"name":"gitlab-experiment","version":"0.7.1","platform":"ruby","checksum":"166dddb3aa83428bcaa93c35684ed01dc4d61f321fd2ae40b020806dc54a7824"},
 {"name":"gitlab-fog-azure-rm","version":"1.3.0","platform":"ruby","checksum":"2fef5317d6515f95f803099afa860fe3019ce6e1907bf49f66b5e06468a617b5"},
-{"name":"gitlab-labkit","version":"0.26.0","platform":"ruby","checksum":"718f1a8fe685780c2d78ecb25cc626e58e8b866a9f59565a5f705a1b84109517"},
+{"name":"gitlab-labkit","version":"0.27.0","platform":"ruby","checksum":"3f30877bc7c07dedc17f1061324c2e123f25c1576d9a892edb85678c9782c75a"},
 {"name":"gitlab-license","version":"2.2.1","platform":"ruby","checksum":"39fcf6be8b2887df8afe01b5dcbae8d08b7c5d937ff56b0fb40484a8c4f02d30"},
 {"name":"gitlab-mail_room","version":"0.0.9","platform":"ruby","checksum":"6700374b5c0aa9d9ad4e711aeb677f0b7d415a6d01d3baa699efab25349d851c"},
 {"name":"gitlab-markup","version":"1.8.1","platform":"ruby","checksum":"ab1f9fd016977497c2af25b76341dea670533014f406861834a0bd99f646707b"},
diff --git a/Gemfile.lock b/Gemfile.lock
index 6920fb22fc5..c7543076468 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -569,7 +569,7 @@ GEM
       fog-json (~> 1.2.0)
       mime-types
       ms_rest_azure (~> 0.12.0)
-    gitlab-labkit (0.26.0)
+    gitlab-labkit (0.27.0)
       actionpack (>= 5.0.0, < 8.0.0)
       activesupport (>= 5.0.0, < 8.0.0)
       grpc (>= 1.37)
@@ -1632,7 +1632,7 @@ DEPENDENCIES
   gitlab-dangerfiles (~> 3.6.1)
   gitlab-experiment (~> 0.7.1)
   gitlab-fog-azure-rm (~> 1.3.0)
-  gitlab-labkit (~> 0.26.0)
+  gitlab-labkit (~> 0.27.0)
   gitlab-license (~> 2.2.1)
   gitlab-mail_room (~> 0.0.9)
   gitlab-markup (~> 1.8.0)
diff --git a/doc/api/events.md b/doc/api/events.md
index 632f573be47..320c7a531e8 100644
--- a/doc/api/events.md
+++ b/doc/api/events.md
@@ -10,7 +10,7 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 ### Actions
 
-See [User contribution events](../user/profile/index.md#user-contribution-events) for available types for the `action` parameter.
+See [User contribution events](../user/profile/contributions_calendar.md#user-contribution-events) for available types for the `action` parameter.
 These options are in lowercase.
 
 ### Target Types
diff --git a/doc/ci/environments/deployment_safety.md b/doc/ci/environments/deployment_safety.md
index ece7b784270..1e4eb54c559 100644
--- a/doc/ci/environments/deployment_safety.md
+++ b/doc/ci/environments/deployment_safety.md
@@ -13,9 +13,10 @@ that help maintain deployment security and stability.
 
 You can:
 
+- Set appropriate roles to your project. See [Project members permissions](../../user/permissions.md#project-members-permissions)
+  for the different user roles GitLab supports and the permissions of each.
 - [Restrict write-access to a critical environment](#restrict-write-access-to-a-critical-environment)
 - [Prevent deployments during deploy freeze windows](#prevent-deployments-during-deploy-freeze-windows)
-- [Set appropriate roles to your project](#setting-appropriate-roles-to-your-project)
 - [Protect production secrets](#protect-production-secrets)
 - [Separate project for deployments](#separate-project-for-deployments)
 
@@ -24,6 +25,9 @@ If you are using a continuous deployment workflow and want to ensure that concur
 - [Ensure only one deployment job runs at a time](#ensure-only-one-deployment-job-runs-at-a-time)
 - [Prevent outdated deployment jobs](#prevent-outdated-deployment-jobs)
 
+<i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
+For an overview, see [How to secure your CD pipelines/workflow](https://www.youtube.com/watch?v=Mq3C1KveDc0).
+
 ## Restrict write access to a critical environment
 
 By default, environments can be modified by any team member that has at least the
@@ -122,19 +126,6 @@ vacation period when most employees are out, you can set up a [Deploy Freeze](..
 During a deploy freeze period, no deployment can be executed. This is helpful to
 ensure that deployments do not happen unexpectedly.
 
-## Setting appropriate roles to your project
-
-GitLab supports several different roles that can be assigned to your project members. See
-[Project members permissions](../../user/permissions.md#project-members-permissions)
-for an explanation of these roles and the permissions of each.
-
-<div class="video-fallback">
-  See the video: <a href="https://www.youtube.com/watch?v=Mq3C1KveDc0">How to secure your CD pipelines</a>.
-</div>
-<figure class="video-container">
-  <iframe src="https://www.youtube.com/embed/Mq3C1KveDc0" frameborder="0" allowfullscreen="true"> </iframe>
-</figure>
-
 ## Protect production secrets
 
 Production secrets are needed to deploy successfully. For example, when deploying to the cloud,
diff --git a/doc/ci/pipelines/index.md b/doc/ci/pipelines/index.md
index e9085a39d21..59310e7923f 100644
--- a/doc/ci/pipelines/index.md
+++ b/doc/ci/pipelines/index.md
@@ -301,6 +301,9 @@ preserving deployment keys and other credentials from being unintentionally
 accessed. To ensure that jobs intended to be executed on protected
 runners do not use regular runners, they must be tagged accordingly.
 
+Review the [deployment safety](../environments/deployment_safety.md)
+page for additional security recommendations for securing your pipelines.
+
 ## Trigger a pipeline when an upstream project is rebuilt **(PREMIUM)**
 
 > [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/9045) in GitLab 12.8.
diff --git a/doc/ci/pipelines/settings.md b/doc/ci/pipelines/settings.md
index d183c6e43ce..d1e34d803bb 100644
--- a/doc/ci/pipelines/settings.md
+++ b/doc/ci/pipelines/settings.md
@@ -237,6 +237,7 @@ Use this regex for commonly used test tools.
 - Simplecov (Ruby). Example: `/\(\d+.\d+\%\) covered/`.
 - pytest-cov (Python). Example: `/(?i)total.*? (100(?:\.0+)?\%|[1-9]?\d(?:\.\d+)?\%)$/`.
 - Scoverage (Scala). Example: `/Statement coverage[A-Za-z\.*]\s*:\s*([^%]+)/`.
+- `pest --coverage --colors=never` (PHP). Example: `/^\s*Cov:\s*\d+\.\d+?%$/`.
 - `phpunit --coverage-text --colors=never` (PHP). Example: `/^\s*Lines:\s*\d+.\d+\%/`.
 - gcovr (C/C++). Example: `/^TOTAL.*\s+(\d+\%)$/`.
 - `tap --coverage-report=text-summary` (NodeJS). Example: `/^Statements\s*:\s*([^%]+)/`.
diff --git a/doc/development/code_review.md b/doc/development/code_review.md
index 00922995562..d0569b9ca6c 100644
--- a/doc/development/code_review.md
+++ b/doc/development/code_review.md
@@ -518,6 +518,9 @@ settings to ensure MRs get an approval from a top-level CODEOWNERS maintainer:
 - [Prevent editing approval rules in merge requests](../user/project/merge_requests/approvals/settings.md#prevent-editing-approval-rules-in-merge-requests).
 - [Remove all approvals when commits are added to the source branch](../user/project/merge_requests/approvals/settings.md#remove-all-approvals-when-commits-are-added-to-the-source-branch)
 
+To update the code owners in the `CODEOWNERS` file for `gitlab-org/gitlab`, follow
+the process explained in the [code owners approvals handbook section](https://about.gitlab.com/handbook/engineering/workflow/code-review/#code-owner-approvals).
+
   There are scenarios such as rebasing locally or applying suggestions that are considered
   the same as adding a commit and could reset existing approvals. Approvals are not removed
   when rebasing from the UI or with the [`/rebase` quick action](../user/project/quick_actions.md).
diff --git a/doc/operations/index.md b/doc/operations/index.md
index b607bea9ea3..ff13c617ea7 100644
--- a/doc/operations/index.md
+++ b/doc/operations/index.md
@@ -57,26 +57,6 @@ and the work required to fix them - all without leaving GitLab.
 - Discover and view errors generated by your applications with
   [Error Tracking](error_tracking.md).
 
-## Trace application health and performance (DEPRECATED)
-
-> [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346485) in GitLab 14.7.
-
-WARNING:
-This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346485)
-in GitLab 14.7, and is planned for removal in GitLab 15.0.
-
-Application tracing in GitLab is a way to measure an application's performance and
-health while it's running. After configuring your application to enable tracing, you
-gain in-depth insight into your application's layers. With application tracing,
-you can measure the execution time of a user journey for troubleshooting or
-optimization purposes.
-
-GitLab integrates with [Jaeger](https://www.jaegertracing.io/) - an open-source,
-end-to-end distributed tracing system tool used for monitoring and troubleshooting
-microservices-based distributed systems - and displays results within GitLab.
-
-- [Trace the performance and health](tracing.md) of a deployed application.
-
 ## Manage your infrastructure in code
 
 GitLab stores and executes your infrastructure as code, whether it's
diff --git a/doc/operations/tracing.md b/doc/operations/tracing.md
index 64d8f8a8707..b3c0763bbbc 100644
--- a/doc/operations/tracing.md
+++ b/doc/operations/tracing.md
@@ -2,50 +2,13 @@
 stage: Monitor
 group: Respond
 info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+remove_date: '2022-11-01'
+redirect_to: 'index.md'
 ---
 
-# Tracing (DEPRECATED) **(FREE SELF)**
+# Tracing (removed) **(FREE SELF)**
 
-> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/42645) from GitLab Ultimate to GitLab Free in 13.5.
-> - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346540) in GitLab 14.7.
-> - [Moved](https://gitlab.com/gitlab-org/gitlab/-/issues/359904) behind a [feature flag](../administration/feature_flags.md) named `monitor_tracing` in GitLab 15.0. Disabled by default.
-
-WARNING:
-This feature is in its end-of-life process. It is [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346540)
-in GitLab 14.7.
-It will be removed completely in GitLab 15.2.
-
-FLAG:
-On self-managed GitLab, by default this feature is not available. To make it available, ask an administrator to [enable the feature flag](../administration/feature_flags.md) named `monitor_tracing`.
-On GitLab.com, this feature is not available.
-This feature is not recommended for production use.
-
-Tracing provides insight into the performance and health of a deployed application, tracking each
-function or microservice that handles a given request. Tracing makes it easy to understand the
-end-to-end flow of a request, regardless of whether you are using a monolithic or distributed
-system.
-
-## Install Jaeger
-
-[Jaeger](https://www.jaegertracing.io/) is an open source, end-to-end distributed tracing system
-used for monitoring and troubleshooting microservices-based distributed systems. To learn more about
-installing Jaeger, read the official
-[Getting Started documentation](https://www.jaegertracing.io/docs/latest/getting-started/).
-
-See also:
-
-- An [all-in-one Docker image](https://www.jaegertracing.io/docs/latest/getting-started/#all-in-one).
-- Deployment options for:
-  - [Kubernetes](https://github.com/jaegertracing/jaeger-kubernetes).
-  - [OpenShift](https://github.com/jaegertracing/jaeger-openshift).
-
-## Link to Jaeger
-
-GitLab provides an easy way to open the Jaeger UI from within your project:
-
-1. [Set up Jaeger](https://www.jaegertracing.io) and configure your application using one of the
-   [client libraries](https://www.jaegertracing.io/docs/latest/client-libraries/).
-1. Navigate to your project's **Settings > Monitor** and provide the Jaeger URL.
-1. Select **Save changes** for the changes to take effect.
-1. You can now visit **Monitor > Tracing** in your project's sidebar and GitLab redirects you to
-   the configured Jaeger URL.
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/346540) in GitLab 14.7
+and [removed](https://gitlab.com/gitlab-org/gitlab/-/issues/346540) in GitLab 15.2.
+We are working on an alternative to replace tracing.
+To learn more, visit the [Observability direction page](https://about.gitlab.com/direction/monitor/observability/).
diff --git a/doc/user/group/contribution_analytics/index.md b/doc/user/group/contribution_analytics/index.md
index c122550652f..f1aa0131645 100644
--- a/doc/user/group/contribution_analytics/index.md
+++ b/doc/user/group/contribution_analytics/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/3090) in GitLab 12.2 for subgroups.
 
-With Contribution Analytics, you can get an overview of the [contribution events](../../profile/index.md#user-contribution-events) in your
+With Contribution Analytics, you can get an overview of the [contribution events](../../profile/contributions_calendar.md#user-contribution-events) in your
 group.
 
 - Analyze your team's contributions over a period of time.
diff --git a/doc/user/profile/contributions_calendar.md b/doc/user/profile/contributions_calendar.md
new file mode 100644
index 00000000000..d1e43054a60
--- /dev/null
+++ b/doc/user/profile/contributions_calendar.md
@@ -0,0 +1,136 @@
+---
+stage: Manage
+group: Workspace
+info: To determine the technical writer assigned to the Stage/Group associated with this page, see https://about.gitlab.com/handbook/product/ux/technical-writing/#assignments
+type: concepts, howto
+---
+
+# Contributions calendar **(FREE)**
+
+The contributions calendar displays a [user's events](#user-contribution-events) from the past 12 months.
+This includes contributions made in forked and [private](#show-private-contributions-on-your-user-profile-page) repositories.
+
+![Contributions calendar](img/contributions_calendar_v15_6.png)
+
+The gradient color of the tiles represents the number of contributions made per day. The gradient ranges from blank (0 contributions) to dark blue (more than 30 contributions).
+
+NOTE:
+The contribution calendar only displays contributions from the last 12 months, but issue [24264](https://gitlab.com/gitlab-org/gitlab/-/issues/24264) proposes to change this to more than 12 months. General improvements to the user profile are proposed in issue [8488](https://gitlab.com/groups/gitlab-org/-/epics/8488).
+
+## User contribution events
+
+GitLab tracks the following contribution events:
+
+- `approved`
+  - Merge request
+- `closed`
+  - [Epic](../group/epics/index.md)
+  - Issue
+  - Merge request
+  - Milestone
+- `commented` on any `Noteable` record.
+  - Alert
+  - Commit
+  - Design
+  - Issue
+  - Merge request
+  - Snippet
+- `created`
+  - Design
+  - [Epic](../group/epics/index.md)
+  - Issue
+  - Merge request
+  - Milestone
+  - Project
+  - Wiki page
+- `destroyed`
+  - Design
+  - Milestone
+  - Wiki page
+- `expired`
+  - Project membership
+- `joined`
+  - Project membership
+- `left`
+  - Project membership
+- `merged`
+  - Merge request
+- `pushed` commits to (or deleted commits from) a repository, individually or in bulk.
+  - Project
+- `reopened`
+  - [Epic](../group/epics/index.md)
+  - Issue
+  - Merge request
+  - Milestone
+- `updated`
+  - Design
+  - Wiki page
+
+### View daily contributions
+
+To view your daily contributions: 
+
+1. On the top bar, in the top-right corner, select your avatar.
+1. Select your name from the dropdown list. 
+1. In the contributions calendar: 
+   - To view the number of contributions for a specific day, hover over a tile.
+   - To view all contributions for a specific day, select a tile. A list displays all contributions and the time they were made.
+
+### Show private contributions on your user profile page
+
+The contributions calendar graph and recent activity list displays your
+[contribution actions](#user-contribution-events) to private projects.
+
+To view private contributions:
+
+1. On the top bar, in the top-right corner, select your avatar.
+1. Select **Edit profile**.
+1. In the **Main settings** section, select the **Include private contributions on my profile** checkbox.
+1. Select **Update profile settings**.
+
+## User activity
+
+### Follow a user's activity
+
+You can follow users whose activity you're interested in.
+In [GitLab 15.5 and later](https://gitlab.com/gitlab-org/gitlab/-/issues/360755),
+the maximum number of users you can follow is 300.
+
+To follow a user, either:
+
+- From a user's profile, select **Follow**.
+- Hover over a user's name, and select **Follow** ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76050)
+  in GitLab 15.0).
+
+To view the activity of users you follow:
+
+1. In the GitLab menu, select **Activity**.
+1. Select the **Followed users** tab.
+
+### Retrieve user activity as a feed
+
+GitLab provides RSS feeds of user activity. To subscribe to the
+RSS feed of a user's activity:
+
+1. Go to the [user's profile](index.md#access-your-user-profile).
+1. In the top right, select the feed symbol **{rss}** to display the results as an RSS feed in Atom format.
+
+The URL of the result contains both a feed token, and
+the user's activity that you're authorized to view.
+You can add this URL to your feed reader.
+
+### Reset the user activity feed token
+
+Feed tokens are sensitive and can reveal information from confidential issues.
+If you think your feed token has been exposed, you should reset it.
+
+To reset your feed token:
+
+1. On the top bar, in the top right corner, select your avatar.
+1. Select **Edit profile**.
+1. On the left sidebar, select **Access Tokens**.
+1. Scroll down. In the **Feed token** section, select the
+   **reset this token** link.
+1. On the confirmation box, select **OK**.
+
+A new token is generated.
diff --git a/doc/user/profile/img/contributions_calendar_v15_6.png b/doc/user/profile/img/contributions_calendar_v15_6.png
new file mode 100644
index 00000000000..363636ec0cd
--- /dev/null
+++ b/doc/user/profile/img/contributions_calendar_v15_6.png
diff --git a/doc/user/profile/index.md b/doc/user/profile/index.md
index 66f6b4b52de..4adf6c351df 100644
--- a/doc/user/profile/index.md
+++ b/doc/user/profile/index.md
@@ -137,7 +137,7 @@ To add links to other accounts:
 
 ## Show private contributions on your user profile page
 
-In the user contribution calendar graph and recent activity list, you can see your [contribution actions](#user-contribution-events) to private projects.
+In the user contribution calendar graph and recent activity list, you can see your [contribution actions](contributions_calendar.md#user-contribution-events) to private projects.
 
 To show private contributions:
 
@@ -311,7 +311,7 @@ git config --global user.email <your email address>
 
 ## User activity
 
-GitLab tracks user contribution activity. You can follow or unfollow other users from either:
+GitLab tracks [user contribution activity](contributions_calendar.md). You can follow or unfollow other users from either:
 
 - Their [user profiles](#access-your-user-profile).
 - The small popover that appears when you hover over a user's name ([introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/76050)
@@ -326,83 +326,6 @@ To view a user's activity in a top-level Activity view:
 1. In the GitLab menu, select **Activity**.
 1. Select the **Followed users** tab.
 
-### User contribution events
-
-Each of these contribution events is tracked:
-
-- `approved`
-  - Merge request
-- `closed`
-  - [Epic](../group/epics/index.md)
-  - Issue
-  - Merge request
-  - Milestone
-- `commented` on any `Noteable` record.
-  - Alert
-  - Commit
-  - Design
-  - Issue
-  - Merge request
-  - Snippet
-- `created`
-  - Design
-  - [Epic](../group/epics/index.md)
-  - Issue
-  - Merge request
-  - Milestone
-  - Project
-  - Wiki page
-- `destroyed`
-  - Design
-  - Milestone
-  - Wiki page
-- `expired`
-  - Project membership
-- `joined`
-  - Project membership
-- `left`
-  - Project membership
-- `merged`
-  - Merge request
-- `pushed` commits to (or deleted commits from) a repository, individually or in bulk.
-  - Project
-- `reopened`
-  - [Epic](../group/epics/index.md)
-  - Issue
-  - Merge request
-  - Milestone
-- `updated`
-  - Design
-  - Wiki page
-
-### Retrieve user activity as a feed
-
-GitLab provides RSS feeds of user activity. To subscribe to the
-RSS feed of a user's activity:
-
-1. Go to the [user's profile](#access-your-user-profile).
-1. In the top right, select the feed symbol **{rss}** to display the results as an RSS feed in Atom format.
-
-The URL of the result contains both a feed token, and
-the user's activity that you're authorized to view.
-You can add this URL to your feed reader.
-
-### Reset the user activity feed token
-
-Feed tokens are sensitive and can reveal information from confidential issues.
-If you think your feed token has been exposed, you should reset it.
-
-To reset your feed token:
-
-1. On the top bar, in the top right corner, select your avatar.
-1. Select **Edit profile**.
-1. On the left sidebar, select **Access Tokens**.
-1. Scroll down. In the **Feed token** section, select the
-   **reset this token** link.
-1. On the confirmation box, select **OK**.
-
-A new token is generated.
-
 ## Troubleshooting
 
 ### Why do I keep getting signed out?
diff --git a/qa/Gemfile b/qa/Gemfile
index 61904642387..bd02aaa9dbf 100644
--- a/qa/Gemfile
+++ b/qa/Gemfile
@@ -8,7 +8,7 @@ gem 'allure-rspec', '~> 2.18.0'
 gem 'capybara', '~> 3.37.1'
 gem 'capybara-screenshot', '~> 1.0.26'
 gem 'rake', '~> 13', '>= 13.0.6'
-gem 'rspec', '~> 3.11'
+gem 'rspec', '~> 3.12'
 gem 'selenium-webdriver', '~> 4.5'
 gem 'airborne', '~> 0.3.7', require: false # airborne is messing with rspec sandboxed mode so not requiring by default
 gem 'rest-client', '~> 2.1.0'
@@ -22,7 +22,7 @@ gem 'timecop', '~> 0.9.5'
 gem 'parallel', '~> 1.22', '>= 1.22.1'
 gem 'rainbow', '~> 3.1.1'
 gem 'rspec-parameterized', '~> 0.5.2'
-gem 'octokit', '~> 5.6.1'
+gem 'octokit', '~> 6.0.0'
 gem "faraday-retry", "~> 2.0"
 gem 'webdrivers', '~> 5.2'
 gem 'zeitwerk', '~> 2.4'
diff --git a/qa/Gemfile.lock b/qa/Gemfile.lock
index f641e6e112b..8e64739df58 100644
--- a/qa/Gemfile.lock
+++ b/qa/Gemfile.lock
@@ -182,7 +182,7 @@ GEM
     nokogiri (1.13.9)
       mini_portile2 (~> 2.8.0)
       racc (~> 1.4)
-    octokit (5.6.1)
+    octokit (6.0.0)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
     oj (3.13.21)
@@ -223,18 +223,18 @@ GEM
     retriable (3.1.2)
     rexml (3.2.5)
     rotp (6.2.0)
-    rspec (3.11.0)
-      rspec-core (~> 3.11.0)
-      rspec-expectations (~> 3.11.0)
-      rspec-mocks (~> 3.11.0)
-    rspec-core (3.11.0)
-      rspec-support (~> 3.11.0)
-    rspec-expectations (3.11.1)
+    rspec (3.12.0)
+      rspec-core (~> 3.12.0)
+      rspec-expectations (~> 3.12.0)
+      rspec-mocks (~> 3.12.0)
+    rspec-core (3.12.0)
+      rspec-support (~> 3.12.0)
+    rspec-expectations (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
-    rspec-mocks (3.11.1)
+      rspec-support (~> 3.12.0)
+    rspec-mocks (3.12.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.11.0)
+      rspec-support (~> 3.12.0)
     rspec-parameterized (0.5.2)
       binding_ninja (>= 0.2.3)
       parser
@@ -243,7 +243,7 @@ GEM
       unparser
     rspec-retry (0.6.2)
       rspec-core (> 3.3)
-    rspec-support (3.11.1)
+    rspec-support (3.12.0)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     ruby-debug-ide (0.7.3)
@@ -318,7 +318,7 @@ DEPENDENCIES
   influxdb-client (~> 2.7)
   knapsack (~> 4.0)
   nokogiri (~> 1.13, >= 1.13.9)
-  octokit (~> 5.6.1)
+  octokit (~> 6.0.0)
   parallel (~> 1.22, >= 1.22.1)
   parallel_tests (~> 3.13)
   pry-byebug (~> 3.10.1)
@@ -326,7 +326,7 @@ DEPENDENCIES
   rake (~> 13, >= 13.0.6)
   rest-client (~> 2.1.0)
   rotp (~> 6.2.0)
-  rspec (~> 3.11)
+  rspec (~> 3.12)
   rspec-parameterized (~> 0.5.2)
   rspec-retry (~> 0.6.2)
   rspec_junit_formatter (~> 0.6.0)