Add latest changes from gitlab-org/gitlab@master

9 files changed, 96 insertions, 68 deletions

diff --git a/doc/api/feature_flags.md b/doc/api/feature_flags.md
index 59fb4660f30..c81a3131f4c 100644
--- a/doc/api/feature_flags.md
+++ b/doc/api/feature_flags.md
@@ -171,19 +171,19 @@ Creates a new feature flag.
 POST /projects/:id/feature_flags
 ```
 
-| Attribute           | Type             | Required   | Description                                                                            |
-| ------------------- | ---------------- | ---------- | ---------------------------------------------------------------------------------------|
-| `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding).       |
-| `name`              | string           | yes        | The name of the feature flag.                                                          |
-| `version`           | string           | yes        | The version of the feature flag. Must be `new_version_flag`. Omit to create a Legacy feature flag. |
-| `description`       | string           | no         | The description of the feature flag.                                                   |
-| `active`            | boolean          | no         | The active state of the flag. Defaults to true. [Supported](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38350) in GitLab 13.3 and later. |
-| `strategies`        | array of strategy JSON objects | no         | The feature flag [strategies](../operations/feature_flags.md#feature-flag-strategies). |
+| Attribute           | Type             | Required   | Description                                                                                                                                                                                                                                                                              |
+| ------------------- | ---------------- | ---------- |------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `id`                | integer/string   | yes        | The ID or [URL-encoded path of the project](rest/index.md#namespaced-path-encoding).                                                                                                                                                                                                     |
+| `name`              | string           | yes        | The name of the feature flag.                                                                                                                                                                                                                                                            |
+| `version`           | string           | yes        | **Deprecated** The version of the feature flag. Must be `new_version_flag`. Omit to create a Legacy feature flag.                                                                                                                                                                        |
+| `description`       | string           | no         | The description of the feature flag.                                                                                                                                                                                                                                                     |
+| `active`            | boolean          | no         | The active state of the flag. Defaults to true. [Supported](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/38350) in GitLab 13.3 and later.                                                                                                                                       |
+| `strategies`        | array of strategy JSON objects | no         | The feature flag [strategies](../operations/feature_flags.md#feature-flag-strategies).                                                                                                                                                                                                   |
 | `strategies:name`   | JSON             | no         | The strategy name. Can be `default`, `gradualRolloutUserId`, `userWithId`, or `gitlabUserList`. In [GitLab 13.5](https://gitlab.com/gitlab-org/gitlab/-/issues/36380) and later, can be [`flexibleRollout`](https://docs.getunleash.io/user_guide/activation_strategy/#gradual-rollout). |
-| `strategies:parameters` | JSON         | no         | The strategy parameters.                                                               |
-| `strategies:scopes` | JSON             | no         | The scopes for the strategy.                                                           |
-| `strategies:scopes:environment_scope` | string | no | The environment scope of the scope.                                                    |
-| `strategies:user_list_id` | integer/string | no     | The ID of the feature flag user list. If strategy is `gitlabUserList`.                 |
+| `strategies:parameters` | JSON         | no         | The strategy parameters.                                                                                                                                                                                                                                                                 |
+| `strategies:scopes` | JSON             | no         | The scopes for the strategy.                                                                                                                                                                                                                                                             |
+| `strategies:scopes:environment_scope` | string | no | The environment scope of the scope.                                                                                                                                                                                                                                                      |
+| `strategies:user_list_id` | integer/string | no     | The ID of the feature flag user list. If strategy is `gitlabUserList`.                                                                                                                                                                                                                   |
 
 ```shell
 curl "https://gitlab.example.com/api/v4/projects/1/feature_flags" \
diff --git a/doc/api/graphql/reference/index.md b/doc/api/graphql/reference/index.md
index e48cec20e9e..a5efccabd38 100644
--- a/doc/api/graphql/reference/index.md
+++ b/doc/api/graphql/reference/index.md
@@ -1103,10 +1103,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Find a workspace.
 
-WARNING:
-**Introduced** in 16.0.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`Workspace`](#workspace).
 
 #### Arguments
@@ -1119,10 +1115,6 @@ Returns [`Workspace`](#workspace).
 
 Find workspaces across the entire instance. This field is only available to instance admins, it will return an empty result for all non-admins.
 
-WARNING:
-**Introduced** in 16.0.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -8743,10 +8735,6 @@ Input type: `WorkItemUpdateInput`
 
 ### `Mutation.workspaceCreate`
 
-WARNING:
-**Introduced** in 16.0.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Input type: `WorkspaceCreateInput`
 
 #### Arguments
@@ -8772,10 +8760,6 @@ Input type: `WorkspaceCreateInput`
 
 ### `Mutation.workspaceUpdate`
 
-WARNING:
-**Introduced** in 16.0.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Input type: `WorkspaceUpdateInput`
 
 #### Arguments
@@ -14412,10 +14396,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -15129,10 +15109,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -16251,10 +16227,6 @@ GitLab CI/CD configuration template.
 
 Workspaces associated with the agent.
 
-WARNING:
-**Introduced** in 16.7.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -17208,10 +17180,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -22093,10 +22061,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -22381,10 +22345,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -22732,10 +22692,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -23056,10 +23012,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
@@ -28163,10 +28115,6 @@ four standard [pagination arguments](#connection-pagination-arguments):
 
 Workspaces owned by the current user.
 
-WARNING:
-**Introduced** in 16.6.
-This feature is an Experiment. It can be changed or removed at any time.
-
 Returns [`WorkspaceConnection`](#workspaceconnection).
 
 This field returns a [connection](#connections). It accepts the
diff --git a/doc/update/deprecations.md b/doc/update/deprecations.md
index a0d1451c2ce..7a7cac19740 100644
--- a/doc/update/deprecations.md
+++ b/doc/update/deprecations.md
@@ -227,6 +227,25 @@ From GitLab 18.0 and later, the methods to register runners introduced by the ne
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### Agent for Kubernetes option `ca-cert-file` renamed
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.9</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/437728).
+</div>
+
+In the GitLab agent for Kubernetes (agentk), the `--ca-cert-file` command line option
+and the corresponding `config.caCert` Helm chart value have been renamed
+to `--kas-ca-cert-file` and `config.kasCaCert`, respectively.
+
+The old `--ca-cert-file` and `config.caCert` options are deprecated, and will
+be removed in GitLab 17.0.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Auto DevOps support for Herokuish is deprecated
 
 <div class="deprecation-notes">
@@ -471,6 +490,23 @@ The GitLab Runner Kubernetes executor setting, `terminationGracePeriodSeconds`,
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### Deprecate `version` field in feature flag API
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.9</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/437986).
+</div>
+
+The `version` field in the [feature flag REST API](https://docs.gitlab.com/ee/api/feature_flags.html)
+is deprecated and will be removed in GitLab 17.0.
+
+After the `version` field is removed, there won't be a way to create legacy feature flags.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Deprecate change vulnerability status from the Developer role
 
 <div class="deprecation-notes">
@@ -795,6 +831,26 @@ In GitLab 16.0 and later:
 
 <div class="deprecation breaking-change" data-milestone="17.0">
 
+### Heroku image upgrade in Auto DevOps build
+
+<div class="deprecation-notes">
+- Announced in GitLab <span class="milestone">16.9</span>
+- Removal in GitLab <span class="milestone">17.0</span> ([breaking change](https://docs.gitlab.com/ee/update/terminology.html#breaking-change))
+- To discuss this change or learn more, see the [deprecation issue](https://gitlab.com/gitlab-org/gitlab/-/issues/437937).
+</div>
+
+In GitLab 17.0, the `auto-build-image` project will upgrade from the `heroku/builder:20` image to `heroku/builder:22`.
+
+To test the behavior of the new image, set the CI/CD variable `AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER` to
+`heroku/builder:22`.
+
+To continue to use `heroku/builder:20` after GitLab 17.0,
+set `AUTO_DEVOPS_BUILD_IMAGE_CNB_BUILDER` to `heroku/builder:20`.
+
+</div>
+
+<div class="deprecation breaking-change" data-milestone="17.0">
+
 ### Internal container registry API tag deletion endpoint
 
 <div class="deprecation-notes">
diff --git a/doc/user/clusters/agent/gitops/flux_oci_tutorial.md b/doc/user/clusters/agent/gitops/flux_oci_tutorial.md
index e1832de51af..09e844e448a 100644
--- a/doc/user/clusters/agent/gitops/flux_oci_tutorial.md
+++ b/doc/user/clusters/agent/gitops/flux_oci_tutorial.md
@@ -106,7 +106,7 @@ To configure, create an [`OCIRepository`](https://fluxcd.io/flux/components/sour
    with the following contents:
 
    ```yaml
-   apiVersion: source.toolkit.fluxcd.io/v1
+   apiVersion: source.toolkit.fluxcd.io/v1beta2
    kind: OCIRepository
    metadata:
      name: web-app-manifests
diff --git a/doc/user/project/merge_requests/index.md b/doc/user/project/merge_requests/index.md
index dece5600b0d..345d937ed8c 100644
--- a/doc/user/project/merge_requests/index.md
+++ b/doc/user/project/merge_requests/index.md
@@ -229,6 +229,7 @@ An administrator can make this option the default in the project's settings.
 > - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
 > - [Disabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320902) in GitLab 13.9.
 > - [Enabled on self-managed](https://gitlab.com/gitlab-org/gitlab/-/issues/320895) GitLab 13.10.
+> - Chained merge requests [changed](https://gitlab.com/gitlab-org/gitlab/-/issues/323329) to automatically rebase on the new target branch in GitLab 16.9.
 
 Merge requests are often chained together, with one merge request depending on
 the code added or changed in another merge request. To support keeping individual
@@ -240,7 +241,7 @@ target branch merges into `main`. For example:
 
 If these merge requests are open at the same time, and merge request 1 (`feature-alpha`)
 merges into `main`, GitLab updates the destination of merge request 2 from `feature-alpha`
-to `main`.
+to `main` and then rebases the source branch onto the new target branch.
 
 Merge requests with interconnected content updates are usually handled in one of these ways:
 
diff --git a/doc/user/project/repository/code_suggestions/index.md b/doc/user/project/repository/code_suggestions/index.md
index ed9eeac1c2c..8f995dc6508 100644
--- a/doc/user/project/repository/code_suggestions/index.md
+++ b/doc/user/project/repository/code_suggestions/index.md
@@ -11,13 +11,18 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Introduced support for Code Generation](https://gitlab.com/gitlab-org/gitlab/-/issues/415583) in GitLab 16.3.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7.
 
+NOTE:
+Starting in February 2024, Code Suggestions will be part of
+[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/),
+available to Premium and Ultimate users for purchase now.
+
 Write code more efficiently by using generative AI to suggest code while you're developing.
 
 With [GitLab Duo Code Suggestions](https://about.gitlab.com/solutions/code-suggestions/), you get:
 
 - Code Completion, which suggests completions to the current line you are typing. These suggestions are usually low latency.
 - Code Generation, which generates code based on a natural language code
-  comment block. Write a comment like `# Type more here` to generate the
+  comment block. Write a comment like `# Type more here`, then press <kbd>Enter</kbd> to generate the
   appropriate code, based on the context of your comment and the rest of your code.
   - Algorithms or large code blocks may take more than 10 seconds to generate.
   - Streaming of code generation responses is supported in VS Code, leading to faster average response times. Other supported IDEs offer slower response times and will return the generated code in a single block.
@@ -66,8 +71,10 @@ The editor supports these languages:
 |------------------|------------------------|------------------------|------------------------|--------|
 | C++              | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | C#               | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
+| CSS              | **{check-circle}** No  | **{check-circle}** Yes | **{check-circle}** No  | **{check-circle}** No  |
 | Go               | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | Google SQL       | **{dotted-circle}** No | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
+| HTML             | **{check-circle}** No  | **{check-circle}** Yes | **{check-circle}** No  | **{check-circle}** No  |
 | Java             | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | JavaScript       | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | Kotlin           | **{check-circle}** Yes (Requires third-party extension providing Kotlin support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
@@ -76,6 +83,7 @@ The editor supports these languages:
 | Ruby             | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | Rust             | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | Scala            | **{check-circle}** Yes (Requires third-party extension providing Scala support) | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
+| Shell scripts (`bash` only) | **{check-circle}** No  | **{check-circle}** Yes | **{check-circle}** No  | **{check-circle}** No  |
 | Swift            | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | TypeScript       | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes | **{check-circle}** Yes |
 | Terraform        | **{check-circle}** Yes (Requires third-party extension providing Terraform support) | **{check-circle}** Yes | **{dotted-circle}** No | **{check-circle}** Yes (Requires third-party extension providing the `terraform` file type) |
diff --git a/doc/user/project/repository/code_suggestions/repository_xray.md b/doc/user/project/repository/code_suggestions/repository_xray.md
index 465bfc8d16a..356b0958344 100644
--- a/doc/user/project/repository/code_suggestions/repository_xray.md
+++ b/doc/user/project/repository/code_suggestions/repository_xray.md
@@ -6,7 +6,12 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 
 # Repository X-Ray **(PREMIUM ALL)**
 
-> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12060) in GitLab 16.7. 
+> [Introduced](https://gitlab.com/groups/gitlab-org/-/epics/12060) in GitLab 16.7.
+
+NOTE:
+Starting in February 2024, Code Suggestions will be part of
+[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/),
+available to Premium and Ultimate users for purchase now.
 
 Repository X-Ray enhances [GitLab Duo Code Suggestions](index.md) by providing additional context to improve the accuracy and relevance of code recommendations.
 
diff --git a/doc/user/project/repository/code_suggestions/saas.md b/doc/user/project/repository/code_suggestions/saas.md
index 4b1cc762406..a0556d00822 100644
--- a/doc/user/project/repository/code_suggestions/saas.md
+++ b/doc/user/project/repository/code_suggestions/saas.md
@@ -13,6 +13,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - [Enabled by default](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/121079) in GitLab 16.1.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7.
 
+NOTE:
+Starting in February 2024, Code Suggestions will be part of
+[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/),
+available to Premium and Ultimate users for purchase now.
+
 Write code more efficiently by using generative AI to suggest code while you're developing.
 
 Usage of GitLab Duo Code Suggestions is governed by the [GitLab Testing Agreement](https://about.gitlab.com/handbook/legal/testing-agreement/).
diff --git a/doc/user/project/repository/code_suggestions/self_managed.md b/doc/user/project/repository/code_suggestions/self_managed.md
index 8cd499c13d0..e14d4197cd9 100644
--- a/doc/user/project/repository/code_suggestions/self_managed.md
+++ b/doc/user/project/repository/code_suggestions/self_managed.md
@@ -12,6 +12,11 @@ info: To determine the technical writer assigned to the Stage/Group associated w
 > - Code Suggestions in the GitLab WebIDE enabled for all GitLab-hosted customers.
 > - [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/435271) in GitLab 16.7.
 
+NOTE:
+Starting in February 2024, Code Suggestions will be part of
+[GitLab Duo Pro](https://about.gitlab.com/gitlab-duo/),
+available to Premium and Ultimate users for purchase now.
+
 Write code more efficiently by using generative AI to suggest code while you're developing.
 
 GitLab Duo Code Suggestions are available on GitLab Enterprise Edition.