Add latest changes from gitlab-org/gitlab@master

8 files changed, 111 insertions, 28 deletions

diff --git a/doc/api/runners.md b/doc/api/runners.md
index e9c389119c4..66a638d4961 100644
--- a/doc/api/runners.md
+++ b/doc/api/runners.md
@@ -789,7 +789,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
 > - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104691) in GitLab 15.7.
 
 WARNING:
-This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/383341) in GitLab 15.7 and is planned for removal in 16.0. This change is a breaking change.
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/383341) in GitLab 15.7 and is planned for removal in 17.0. This change is a breaking change.
 
 Reset the runner registration token for a project.
 
@@ -808,7 +808,7 @@ curl --request POST --header "PRIVATE-TOKEN: <your_access_token>" \
 > - [Deprecated](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/104691) in GitLab 15.7.
 
 WARNING:
-This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/383341) in GitLab 15.7 and is planned for removal in 16.0. This change is a breaking change.
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/383341) in GitLab 15.7 and is planned for removal in 17.0. This change is a breaking change.
 
 Reset the runner registration token for a group.
 
diff --git a/doc/architecture/blueprints/runner_tokens/index.md b/doc/architecture/blueprints/runner_tokens/index.md
index 1c2ae3a56d8..69a10674d7d 100644
--- a/doc/architecture/blueprints/runner_tokens/index.md
+++ b/doc/architecture/blueprints/runner_tokens/index.md
@@ -408,8 +408,8 @@ scope.
 | Component        | Milestone | Changes |
 |------------------|----------:|---------|
 | GitLab Runner    | `%16.0`   | Do not allow runner to start if `.runner_system_id` file cannot be written. |
-| GitLab Rails app | `%16.0`   | Enable `:enforce_create_runner_workflow` feature flag by default. |
-| GitLab Rails app | `%16.0`   | Start reject job requests that don't include `system_id` value. |
+| GitLab Rails app | `%16.6`   | Enable `:enforce_create_runner_workflow` feature flag by default. |
+| GitLab Rails app | `%16.6`   | Start reject job requests that don't include `system_id` value. |
 
 ### Stage 7 - Removals
 
@@ -425,7 +425,7 @@ scope.
 
 ### Will my runner registration workflow break?
 
-If no action is taken before your GitLab instance is upgraded to 16.0, then your runner registration
+If no action is taken before your GitLab instance is upgraded to 16.6, then your runner registration
 worflow will break.
 For self-managed instances, to continue using the previous runner registration process,
 you can disable the `enforce_create_runner_workflow` feature flag until GitLab 17.0.
@@ -456,7 +456,7 @@ This allows the GitLab instance to display which system executed a given job.
 
 - In GitLab 15.10, we plan to implement runner creation directly in the runners administration page,
   and prepare the runner to follow the new workflow.
-- In GitLab 16.0, we plan to disable registration tokens.
+- In GitLab 16.6, we plan to disable registration tokens.
   For self-managed instances, to continue using
   registration tokens, you can disable the `enforce_create_runner_workflow` feature flag until
   GitLab 17.0.
diff --git a/doc/ci/yaml/includes.md b/doc/ci/yaml/includes.md
index d29d0226577..bf0b7444e78 100644
--- a/doc/ci/yaml/includes.md
+++ b/doc/ci/yaml/includes.md
@@ -157,6 +157,87 @@ and the `environment:url` of the `production` job defined in the `.gitlab-ci.yml
 override the values defined in the `autodevops-template.yml` file. The other keywords
 do not change. This method is called *merging*.
 
+### Merge method for `include`
+
+For a file containing `include` directives, the included files are read in order (possibly
+recursively), and the configuration in these files is likewise merged in order. If the parameters overlap, the last included file takes precedence. Finally, the directives in the
+file itself are merged with the configuration from the included files.
+
+This merge method is a _deep merge_, where hash maps are merged at any depth in the
+configuration. To merge hash map A (containing the configuration merged so far) and B (the next piece
+of configuration), the keys and values are processed as follows:
+
+- When the key only exists in A, use the key and value from A.
+- When the key exists in both A and B, and their values are both hash maps, merge those hash maps.
+- When the key exists in both A and B, and one of the values is not a hash map, use the value from B.
+- Otherwise, use the key and value from B.
+
+For example:
+
+We have a configuration consisting of two files.
+
+- The `.gitlab-ci.yml` file:
+
+  ```yaml
+  include: 'common.yml'
+
+  variables:
+    POSTGRES_USER: username
+
+  test:
+    rules:
+      - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+        when: manual
+    artifacts:
+      reports:
+        junit: rspec.xml
+  ```
+
+- The `common.yml` file:
+
+  ```yaml
+  variables:
+    POSTGRES_USER: common_username
+    POSTGRES_PASSWORD: testing_password
+
+  test:
+    rules:
+      - when: never
+    script:
+      - echo LOGIN=${POSTGRES_USER} > deploy.env
+      - rake spec
+    artifacts:
+      reports:
+        dotenv: deploy.env
+  ```
+
+The merged result:
+
+```yaml
+variables:
+  POSTGRES_USER: username
+  POSTGRES_PASSWORD: testing_password
+
+test:
+  rules:
+    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
+      when: manual
+  script:
+    - echo LOGIN=${POSTGRES_USER} > deploy.env
+    - rake spec
+  artifacts:
+    reports:
+      junit: rspec.xml
+      dotenv: deploy.env
+```
+
+In this example:
+
+- Variables are only evaluated after all the files are merged together. A job in an included file
+  might end up using a variable value defined in a different file.
+- `rules` is an array so it cannot be merged. The top-level file takes precedence.
+- `artifacts` is a hash map so it can be deep merged.
+
 ## Override included configuration arrays
 
 You can use merging to extend and override configuration in an included template, but
diff --git a/doc/integration/jira/index.md b/doc/integration/jira/index.md
index 0bec7e7cec9..2ad71a19cf7 100644
--- a/doc/integration/jira/index.md
+++ b/doc/integration/jira/index.md
@@ -19,9 +19,9 @@ in your GitLab project with any of your projects in Jira.
 
 ### Jira integration
 
-This integration connects one or more GitLab projects to a Jira instance. The Jira instance
-can be hosted by you or in [Atlassian cloud](https://www.atlassian.com/migration/assess/why-cloud).
-The supported Jira versions are `v6.x`, `v7.x`, and `v8.x`.
+This integration connects one or more GitLab projects to a Jira instance. You can host
+the Jira instance yourself or in [Atlassian Cloud](https://www.atlassian.com/migration/assess/why-cloud).
+The supported Jira versions are `6.x`, `7.x`, `8.x`, and `9.x`.
 
 <i class="fa fa-youtube-play youtube" aria-hidden="true"></i>
 For an overview, see [Agile Management - GitLab-Jira Basic Integration](https://www.youtube.com/watch?v=fWvwkx5_00E&feature=youtu.be).
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index 83b95ee1033..180f9d0c6ed 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -1000,7 +1000,7 @@ The endpoint to get [changes from a single merge request](https://docs.gitlab.co
 
 ### Support for REST API endpoints that reset runner registration tokens
 
-End of Support: GitLab <span class="removal-milestone">16.0</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1131,7 +1131,7 @@ From GitLab 13.6, users can [specify any runner configuration in the GitLab Runn
 
 ### GitLab Runner registration token in Runner Operator
 
-End of Support: GitLab <span class="removal-milestone">16.0</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1146,7 +1146,7 @@ The [`runner-registration-token`](https://docs.gitlab.com/runner/install/operato
 
 ### Registration tokens and server-side runner arguments in `POST /api/v4/runners` endpoint
 
-End of Support: GitLab <span class="removal-milestone">16.0</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1158,7 +1158,7 @@ This endpoint [registers](https://docs.gitlab.com/ee/api/runners.html#register-a
 with a GitLab instance at the instance, group, or project level through the API. We plan to remove the support for
 registration tokens and certain configuration arguments in this endpoint in GitLab 17.0.
 
-In GitLab 15.8, we plan to implement a new method to bind runners to a GitLab instance,
+In GitLab 15.10, we plan to implement a new method to bind runners to a GitLab instance,
 as part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/).
 This new architecture introduces a new method for registering runners and will eliminate the legacy
 [runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
@@ -1170,7 +1170,7 @@ From GitLab 17.0 and later, the runner registration methods implemented by the n
 
 ### Registration tokens and server-side runner arguments in `gitlab-runner register` command
 
-End of Support: GitLab <span class="removal-milestone">16.0</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1178,7 +1178,7 @@ This is a [breaking change](https://docs.gitlab.com/ee/development/deprecation_g
 Review the details carefully before upgrading.
 
 The support for registration tokens and certain configuration arguments in the command to [register](https://docs.gitlab.com/runner/register/) a runner, `gitlab-runner register` is deprecated.
-GitLab plans to introduce a new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/) in GitLab 15.8,
+GitLab plans to introduce a new [GitLab Runner token architecture](https://docs.gitlab.com/ee/architecture/blueprints/runner_tokens/) in GitLab 15.10,
 which introduces a new method for registering runners and eliminates the legacy
 [runner registration token](https://docs.gitlab.com/ee/security/token_overview.html#runner-registration-tokens).
 The new method will involve creating the runner in the GitLab UI and passing the
@@ -1191,7 +1191,7 @@ to the `gitlab-runner register` command.
 
 ### `runnerRegistrationToken` parameter for GitLab Runner Helm Chart
 
-End of Support: GitLab <span class="removal-milestone">16.0</span> <span class="support-end-date"></span><br />
+End of Support: GitLab <span class="removal-milestone">16.6</span> <span class="support-end-date"></span><br />
 Planned removal: GitLab <span class="removal-milestone">17.0</span> <span class="removal-date"></span>
 
 WARNING:
@@ -1204,6 +1204,7 @@ As part of the new [GitLab Runner token architecture](https://docs.gitlab.com/ee
 
 - A new method to bind runners to a GitLab instance leveraging `runnerToken`.
 - A unique system ID saved to the `config.toml`, which will ensure traceability between jobs and runners.
+
 From GitLab 17.0 and later, the methods to register runners introduced by the new GitLab Runner token architecture will be the only supported methods.
 
 </div>
diff --git a/doc/user/project/integrations/gitlab_slack_application.md b/doc/user/project/integrations/gitlab_slack_application.md
index ac29a639436..649b0c51818 100644
--- a/doc/user/project/integrations/gitlab_slack_application.md
+++ b/doc/user/project/integrations/gitlab_slack_application.md
@@ -7,11 +7,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # GitLab for Slack app **(FREE SAAS)**
 
 NOTE:
-The GitLab for Slack app is only configurable for GitLab SaaS customers.
-Self-managed GitLab customers should configure
-[Slack slash commands](slack_slash_commands.md) and [Slack notifications](slack.md) instead. See
-[Slack application integration for self-managed instances](https://gitlab.com/groups/gitlab-org/-/epics/1211)
-for our plans to make the app configurable for all GitLab installations.
+This feature is only configurable on GitLab.com.
+For self-managed GitLab instances, use
+[Slack slash commands](slack_slash_commands.md) and [Slack notifications](slack.md) instead.
+For more information about our plans to make this feature configurable for all GitLab installations,
+see [epic 1211](https://gitlab.com/groups/gitlab-org/-/epics/1211).
 
 Slack provides a native application that you can enable with your project's
 integrations on GitLab.com.
diff --git a/doc/user/project/integrations/slack.md b/doc/user/project/integrations/slack.md
index d14401a5c9d..1d452141dbd 100644
--- a/doc/user/project/integrations/slack.md
+++ b/doc/user/project/integrations/slack.md
@@ -7,10 +7,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 # Slack notifications integration **(FREE)**
 
 WARNING:
-This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/372411) for GitLab SaaS customers
-in GitLab 15.10 and is [planned for removal](https://gitlab.com/groups/gitlab-org/-/epics/8673).
-GitLab SaaS customers can use the [GitLab for Slack app](gitlab_slack_application.md) instead.
-Self-managed GitLab customers can continue to use this feature.
+This feature was [deprecated](https://gitlab.com/gitlab-org/gitlab/-/issues/372411) on GitLab.com
+in GitLab 15.9 and is [planned for removal](https://gitlab.com/groups/gitlab-org/-/epics/8673).
+For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) instead.
+For self-managed GitLab instances, you can continue to use this feature.
 
 The Slack notifications integration enables your GitLab project to send events
 (such as issue creation) to your existing Slack team as notifications. Setting up
diff --git a/doc/user/project/integrations/slack_slash_commands.md b/doc/user/project/integrations/slack_slash_commands.md
index bfa0ae94341..2563cec2b05 100644
--- a/doc/user/project/integrations/slack_slash_commands.md
+++ b/doc/user/project/integrations/slack_slash_commands.md
@@ -6,6 +6,10 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Slack slash commands **(FREE SELF)**
 
+NOTE:
+This feature is only configurable on self-managed GitLab instances.
+For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) instead.
+
 If you want to control and view GitLab content while you're
 working in Slack, you can use Slack slash commands.
 To use Slack slash commands, you must configure both Slack and GitLab.
@@ -13,9 +17,6 @@ To use Slack slash commands, you must configure both Slack and GitLab.
 GitLab can also send events (for example, `issue created`) to Slack as notifications.
 The [Slack notifications service](slack.md) is configured separately.
 
-NOTE:
-The Slack slash commands are only configurable on self-managed GitLab instances. For GitLab.com, use the [GitLab for Slack app](gitlab_slack_application.md) instead.
-
 ## Configure GitLab and Slack
 
 Slack slash command integrations