Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

data/deprecations/17-9-deprecate-public-subscriptions-apis.yml

@@ -16,14 +16,10 @@
     - `POST /api/v4/namespaces/:namespace_id/minutes`
     - `GET /api/v4/namespaces/:namespace_id/subscription_add_on_purchase/:id`
     - `POST /api/v4/namespaces/:id/gitlab_subscription`
-    - `PUT /api/v4/namespaces/:id/gitlab_subscription`
     - `PUT /api/v4/user/:id/credit_card_validation`
     - `PUT /api/v4/namespaces/:namespace_id/subscription_add_on_purchase/:id`
     - `POST /api/v4/namespaces/:namespace_id/subscription_add_on_purchase/:id`
     - `PATCH /api/v4/namespaces/:previous_namespace_id/minutes/move/:target_namespace_id`
-    - `DELETE /api/v4/internal/upcoming_reconciliations`
-    - `PUT /api/v4/internal/upcoming_reconciliations`
-    - `PUT /api/v4/namespaces/:id`
 
     These endpoints were being used by the Subscription Portal to manage subscription information on GitLab.com. Their
     usage has been replaced by internal endpoints with JWT authentication to support the upcoming Cells architecture.

doc/administration/admin_area.md

@@ -149,6 +149,12 @@ By default, impersonation is enabled. GitLab can be configured to
 
 ### User identities
 
+{{< details >}}
+
+- Tier: Premium, Ultimate
+
+{{< /details >}}
+
 {{< history >}}
 
 - Viewing a user's SCIM identity [introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/294608) in GitLab 15.3.

doc/administration/gitlab_duo_self_hosted/supported_models_and_hardware_requirements.md

@@ -50,18 +50,18 @@ Support for the following GitLab-supported large language models (LLMs) is gener
 | GPT | [GPT-4 Turbo](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=python-secure#gpt-4) | [Azure OpenAI](https://learn.microsoft.com/en-us/azure/ai-services/openai/overview) | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-dashed" >}} Largely compatible |
 | GPT | [GPT-4o](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=python-secure#gpt-4o-and-gpt-4-turbo) | [Azure OpenAI](https://learn.microsoft.com/en-us/azure/ai-services/openai/overview) | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-filled" >}} Fully compatible |
 | GPT | [GPT-4o-mini](https://learn.microsoft.com/en-us/azure/ai-services/openai/concepts/models?tabs=python-secure#gpt-4o-and-gpt-4-turbo) | [Azure OpenAI](https://learn.microsoft.com/en-us/azure/ai-services/openai/overview) | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-dashed" >}} Largely compatible |
+| Llama | [Llama 3 8B](https://huggingface.co/meta-llama/Meta-Llama-3-8B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | {{< icon name="check-circle-dashed" >}} Largely compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="dash-circle" >}} Not compatible |
+| Llama | [Llama 3.1 8B](https://huggingface.co/meta-llama/Llama-3.1-8B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | {{< icon name="check-circle-dashed" >}} Largely compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-dashed" >}} Largely compatible |
+| Llama | [Llama 3 70B](https://huggingface.co/meta-llama/Meta-Llama-3-70B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | {{< icon name="check-circle-dashed" >}} Largely compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="dash-circle" >}} Not compatible |
+| Llama | [Llama 3.1 70B](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | {{< icon name="check-circle-dashed" >}} Largely compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-filled" >}} Fully compatible |
+| Llama | [Llama 3.3 70B](https://huggingface.co/meta-llama/Llama-3.3-70B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | {{< icon name="check-circle-dashed" >}} Largely compatible | {{< icon name="check-circle-filled" >}} Fully compatible | {{< icon name="check-circle-filled" >}} Fully compatible |
 
 ### Experimental and beta models
 
 The following models are configurable for the functionalities marked below, but are currently in beta or experimental status, under evaluation, and are excluded from the "Customer Integrated Models" definition in the [AI Functionality Terms](https://handbook.gitlab.com/handbook/legal/ai-functionality-terms/):
 
 | Model family   | Model | Supported platforms | Status | Code completion | Code generation | GitLab Duo Chat |
 |--------------- |-------|---------------------|--------|-----------------|-----------------|-----------------|
-| Llama | [Llama 3 8B](https://huggingface.co/meta-llama/Meta-Llama-3-8B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Beta | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes |
-| Llama | [Llama 3.1 8B](https://huggingface.co/meta-llama/Llama-3.1-8B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Beta | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes |
-| Llama | [Llama 3 70B](https://huggingface.co/meta-llama/Meta-Llama-3-70B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Beta | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes |
-| Llama | [Llama 3.1 70B](https://huggingface.co/meta-llama/Llama-3.1-70B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Beta | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes |
-| Llama | [Llama 3.3 70B](https://huggingface.co/meta-llama/Llama-3.3-70B-Instruct) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Beta | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes | {{< icon name="check-circle" >}} Yes |
 | CodeGemma      | [CodeGemma 2b](https://huggingface.co/google/codegemma-2b) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Experimental | {{< icon name="check-circle" >}} Yes | {{< icon name="dotted-circle" >}} No | {{< icon name="dotted-circle" >}} No |
 | CodeGemma      | [CodeGemma 7b-it](https://huggingface.co/google/codegemma-7b-it) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Experimental | {{< icon name="dotted-circle" >}} No | {{< icon name="check-circle" >}} Yes | {{< icon name="dotted-circle" >}} No |
 | CodeGemma      | [CodeGemma 7b-code](https://huggingface.co/google/codegemma-7b) | [vLLM](supported_llm_serving_platforms.md#for-self-hosted-model-deployments) | Experimental | {{< icon name="check-circle" >}} Yes | {{< icon name="dotted-circle" >}} No | {{< icon name="dotted-circle" >}} No |

doc/update/deprecations.md

@@ -2043,14 +2043,10 @@ The following endpoints in the public REST API will be removed:
 - `POST /api/v4/namespaces/:namespace_id/minutes`
 - `GET /api/v4/namespaces/:namespace_id/subscription_add_on_purchase/:id`
 - `POST /api/v4/namespaces/:id/gitlab_subscription`
-- `PUT /api/v4/namespaces/:id/gitlab_subscription`
 - `PUT /api/v4/user/:id/credit_card_validation`
 - `PUT /api/v4/namespaces/:namespace_id/subscription_add_on_purchase/:id`
 - `POST /api/v4/namespaces/:namespace_id/subscription_add_on_purchase/:id`
 - `PATCH /api/v4/namespaces/:previous_namespace_id/minutes/move/:target_namespace_id`
-- `DELETE /api/v4/internal/upcoming_reconciliations`
-- `PUT /api/v4/internal/upcoming_reconciliations`
-- `PUT /api/v4/namespaces/:id`
 
 These endpoints were being used by the Subscription Portal to manage subscription information on GitLab.com. Their
 usage has been replaced by internal endpoints with JWT authentication to support the upcoming Cells architecture.

doc/user/gitlab_duo/_index.md

@@ -79,9 +79,8 @@ To improve your workflow while authoring code, try these features:
 - [Test Generation](../gitlab_duo_chat/examples.md#write-tests-in-the-ide): Test your code by generating tests.
   <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://www.youtube.com/watch?v=zWhwuixUkYU)
 - [Refactor Code](../gitlab_duo_chat/examples.md#refactor-code-in-the-ide): Improve or refactor the selected code.
-  <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://www.youtube.com/watch?v=zWhwuixUkYU)
+  <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://youtu.be/oxziu7_mWVk?si=fS2JUO-8doARS169)
 - [Fix Code](../gitlab_duo_chat/examples.md#fix-code-in-the-ide): Fix quality problems, like bugs or typos, in the selected code.
-  <i class="fa fa-youtube-play youtube" aria-hidden="true"></i> [Watch overview](https://www.youtube.com/watch?v=zWhwuixUkYU)
 - [GitLab Duo for the CLI](../../editor_extensions/gitlab_cli/_index.md#gitlab-duo-for-the-cli): Discover or recall `git` commands.
 
 ## Reviewing code

doc/user/project/repository/push_rules.md

@@ -83,6 +83,10 @@ These push rules apply only to commits and not [tags](tags/_index.md).
 - **Commit author's email**: Both the author and committer email addresses must match the regular expression.
   To allow any email address, leave empty.
 
+When using [bot users for projects](../../project/settings/project_access_tokens.md#bot-users-for-projects)
+or [bot users for groups](../../group/settings/group_access_tokens.md#bot-users-for-groups),
+you must add the generated email suffix so that bot tokens can commit and push changes.
+
 ## Validate commit messages
 
 Use these rules for your commit messages.

locale/gitlab.pot

@@ -15434,6 +15434,9 @@ msgstr ""
 msgid "ComplianceFrameworks|No projects found that match filters"
 msgstr ""
 
+msgid "ComplianceFrameworks|No projects selected"
+msgstr ""
+
 msgid "ComplianceFrameworks|Note: This report was truncated to adhere to filesize limits of %{size}."
 msgstr ""
 
@@ -15506,6 +15509,9 @@ msgstr ""
 msgid "ComplianceFrameworks|Set compliance pipeline configuration for projects that use this framework. %{linkStart}How do I create the configuration?%{linkEnd}"
 msgstr ""
 
+msgid "ComplianceFrameworks|Show only selected"
+msgstr ""
+
 msgid "ComplianceFrameworks|Subgroup"
 msgstr ""
 

spec/features/issues/filtered_search/recent_searches_spec.rb

@@ -23,7 +23,7 @@
 
     submit_then_clear_search 'foo'
     submit_then_clear_search 'bar'
-    click_button 'Toggle history'
+    click_button 'Toggle search history'
 
     expect_recent_searches_history_item 'bar'
     expect_recent_searches_history_item 'foo'
@@ -33,7 +33,7 @@
     visit project_issues_path(project_1, label_name: 'foo', search: 'bar')
     visit project_issues_path(project_1, label_name: 'qux', search: 'garply')
 
-    click_button 'Toggle history'
+    click_button 'Toggle search history'
 
     expect_recent_searches_history_item 'Label := qux garply'
     expect_recent_searches_history_item 'Label := foo bar'
@@ -43,7 +43,7 @@
     set_recent_searches(project_1_local_storage_key, '[[{"type":"filtered-search-term","value":{"data":"saved1"}}],[{"type":"filtered-search-term","value":{"data":"saved2"}}]]')
 
     visit project_issues_path(project_1, search: 'foo')
-    click_button 'Toggle history'
+    click_button 'Toggle search history'
 
     expect_recent_searches_history_item 'foo'
     expect_recent_searches_history_item 'saved1'
@@ -60,7 +60,7 @@
 
     submit_then_clear_search 'more'
     submit_then_clear_search 'things'
-    click_button 'Toggle history'
+    click_button 'Toggle search history'
 
     expect_recent_searches_history_item 'things'
     expect_recent_searches_history_item 'more'
@@ -70,7 +70,7 @@
     set_recent_searches(project_1_local_storage_key, '[[{"type":"filtered-search-term","value":{"data":"foo"}}],[{"type":"filtered-search-term","value":{"data":"bar"}}]]')
     visit project_issues_path(project_1)
 
-    click_button 'Toggle history'
+    click_button 'Toggle search history'
     click_button 'foo'
 
     expect_search_term 'foo'
@@ -80,7 +80,7 @@
     set_recent_searches(project_1_local_storage_key, '[[{"type":"filtered-search-term","value":{"data":"foo"}}]]')
     visit project_issues_path(project_1)
 
-    click_button 'Toggle history'
+    click_button 'Toggle search history'
 
     expect_recent_searches_history_item_count 1