From 81f76de736c7fb4cdab784338bb594013efeb782 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Mon, 21 Apr 2025 15:07:14 +0000 Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master --- .eslint_todo/vue-no-unused-properties.mjs | 1 - app/helpers/application_settings_helper.rb | 10 +-- doc/ci/jobs/ci_job_token.md | 2 +- doc/user/group/manage.md | 2 +- doc/user/profile/service_accounts.md | 6 ++ doc/user/search/_index.md | 2 +- locale/gitlab.pot | 75 +++++++++---------- .../application_settings_helper_spec.rb | 10 +-- 8 files changed, 55 insertions(+), 53 deletions(-) diff --git a/.eslint_todo/vue-no-unused-properties.mjs b/.eslint_todo/vue-no-unused-properties.mjs index 310ffef6c81..f428b82b8df 100644 --- a/.eslint_todo/vue-no-unused-properties.mjs +++ b/.eslint_todo/vue-no-unused-properties.mjs @@ -454,7 +454,6 @@ export default { 'ee/app/assets/javascripts/sidebar/components/health_status/health_status_dropdown.vue', 'ee/app/assets/javascripts/sidebar/components/incidents/escalation_status.vue', 'ee/app/assets/javascripts/sidebar/components/weight/sidebar_weight_widget.vue', - 'ee/app/assets/javascripts/test_case_show/components/test_case_sidebar.vue', 'ee/app/assets/javascripts/tracing/details/tracing_details.vue', 'ee/app/assets/javascripts/usage_quotas/code_suggestions/components/code_suggestions_info_card.vue', 'ee/app/assets/javascripts/usage_quotas/code_suggestions/components/search_and_sort_bar.vue', diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index e051ef799ec..0ba2f51e0aa 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -76,29 +76,29 @@ module ApplicationSettingsHelper [ form.gitlab_ui_checkbox_component( :global_search_block_anonymous_searches_enabled, - _("Enable blocking of anonymous global search requests"), + _("Restrict global search to authenticated users"), checkbox_options: { checked: @application_setting.global_search_block_anonymous_searches_enabled, multiple: false } ), form.gitlab_ui_checkbox_component( :global_search_issues_enabled, - _("Enable issues tab in global search results"), + _("Show issues in global search results"), checkbox_options: { checked: @application_setting.global_search_issues_enabled, multiple: false } ), form.gitlab_ui_checkbox_component( :global_search_merge_requests_enabled, - _("Enable merge requests tab in global search results"), + _("Show merge requests in global search results"), checkbox_options: { checked: @application_setting.global_search_merge_requests_enabled, multiple: false } ), form.gitlab_ui_checkbox_component( :global_search_snippet_titles_enabled, - _("Enable snippet tab in global search results"), + _("Show snippets in global search results"), checkbox_options: { checked: @application_setting.global_search_snippet_titles_enabled, multiple: false } ), form.gitlab_ui_checkbox_component( :global_search_users_enabled, - _("Enable users tab in global search results"), + _("Show users in global search results"), checkbox_options: { checked: @application_setting.global_search_users_enabled, multiple: false } ) ] diff --git a/doc/ci/jobs/ci_job_token.md b/doc/ci/jobs/ci_job_token.md index 1ca008e80e5..7917bd1528c 100644 --- a/doc/ci/jobs/ci_job_token.md +++ b/doc/ci/jobs/ci_job_token.md @@ -486,7 +486,7 @@ New authentications to a project can take up to 5 minutes to appear in the authe {{< /history >}} -Beginning in GitLab 18.0, CI/CD job tokens use the JWT standard by default. All new projects created after February 21, 2025 on GitLab.com or from 17.10 on GitLab Self-Managed use this standard. Existing projects can continue to use the legacy format by configuring the top-level group for their project. This setting is only available until the GitLab 19.0 release. +Beginning in GitLab 19.0, CI/CD job tokens use the JWT standard by default. Projects can continue to use the legacy format by configuring the top-level group for their project. This setting is only available until the GitLab 20.0 release. To use the legacy format for your CI/CD tokens: diff --git a/doc/user/group/manage.md b/doc/user/group/manage.md index 12cc50ab0f0..19a3ab593d0 100644 --- a/doc/user/group/manage.md +++ b/doc/user/group/manage.md @@ -276,13 +276,13 @@ For members with `Minimal Access` in the selected group, their `Max Role` and `S - Tier: Premium, Ultimate - Offering: GitLab.com -- Status: Beta {{< /details >}} {{< history >}} - [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/442718) in GitLab 17.5. +- [Generally available](https://gitlab.com/gitlab-org/gitlab/-/issues/523468) in GitLab 18.0. {{< /history >}} diff --git a/doc/user/profile/service_accounts.md b/doc/user/profile/service_accounts.md index effa98b2a42..9e3463511e0 100644 --- a/doc/user/profile/service_accounts.md +++ b/doc/user/profile/service_accounts.md @@ -52,6 +52,12 @@ You can also manage service accounts through the API. ## View and manage service accounts +{{< history >}} + +- Introduced for GitLab.com in GitLab 17.11 + +{{< /history >}} + The Service Accounts page displays information about service accounts in your top-level group or instance. Each top-level group and GitLab Self-Managed instance has a separate Service Accounts page. From these pages, you can: - View all service accounts for your group or instance. diff --git a/doc/user/search/_index.md b/doc/user/search/_index.md index faff483619b..fd16de7977e 100644 --- a/doc/user/search/_index.md +++ b/doc/user/search/_index.md @@ -75,7 +75,7 @@ To restrict global search to authenticated users only: 1. On the left sidebar, at the bottom, select **Admin**. 1. Select **Settings > Search**. 1. Expand **Global search** -1. Select **Enable blocking of anonymous global search requests**. +1. Select **Restrict global search to authenticated users**. 1. Select **Save changes**. ## Disable global search scopes diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 9253fc04624..f6df714039a 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -11581,9 +11581,6 @@ msgstr "" msgid "CICD|Allow Git push requests to the repository" msgstr "" -msgid "CICD|Allow composite identities to run pipelines" -msgstr "" - msgid "CICD|An error occurred while adding the authentication log entries. Please try again." msgstr "" @@ -11641,9 +11638,6 @@ msgstr "" msgid "CICD|Continuous deployment to production using timed incremental rollout" msgstr "" -msgid "CICD|Controls whether AI agents can automatically run pipelines. When disabled, pipelines triggered by AI agents will require manual review and execution by a human user." -msgstr "" - msgid "CICD|Default (user membership and role)" msgstr "" @@ -11716,6 +11710,9 @@ msgstr "" msgid "CICD|Pipelines older than the configured time are deleted. Leave empty to never delete pipelines automatically. The default unit is in seconds, but you can use other units, for example %{code_open}15 days%{code_close}, %{code_open}1 month%{code_close}, %{code_open}1 year%{code_close}. Can be between 1 day to 1 year." msgstr "" +msgid "CICD|Pipelines triggered by composite identities, including AI agents, run automatically without review or manual interaction." +msgstr "" + msgid "CICD|Prevent CI/CD job tokens from this project from being used to access other projects unless the other project is added to the allowlist. It is a security risk to disable this feature, because unauthorized projects might attempt to retrieve an active token and access the API. %{linkStart}Learn more%{linkEnd}." msgstr "" @@ -11731,6 +11728,9 @@ msgstr "" msgid "CICD|Removing these entries could cause authentication failures or disrupt pipelines." msgstr "" +msgid "CICD|Run pipelines triggered by AI agents automatically" +msgstr "" + msgid "CICD|Select the groups and projects authorized to use a CI/CD job token to authenticate requests to this project. %{linkStart}Learn more%{linkEnd}." msgstr "" @@ -23841,39 +23841,24 @@ msgstr "" msgid "Enable automatic repository housekeeping" msgstr "" -msgid "Enable blocking of anonymous global search requests" -msgstr "" - msgid "Enable cleanup policies for projects created earlier than GitLab 12.7." msgstr "" msgid "Enable cleanup policy caching." msgstr "" -msgid "Enable code tab in global search results" -msgstr "" - -msgid "Enable commits tab in global search results" -msgstr "" - msgid "Enable diagrams.net" msgstr "" msgid "Enable email notification" msgstr "" -msgid "Enable epics tab in global search results" -msgstr "" - msgid "Enable feature to choose access level" msgstr "" msgid "Enable for this project" msgstr "" -msgid "Enable global search for limited indexing" -msgstr "" - msgid "Enable group runners" msgstr "" @@ -23898,15 +23883,9 @@ msgstr "" msgid "Enable integration" msgstr "" -msgid "Enable issues tab in global search results" -msgstr "" - msgid "Enable maintenance mode" msgstr "" -msgid "Enable merge requests tab in global search results" -msgstr "" - msgid "Enable multipart emails" msgstr "" @@ -23937,9 +23916,6 @@ msgstr "" msgid "Enable security training" msgstr "" -msgid "Enable snippet tab in global search results" -msgstr "" - msgid "Enable two-factor authentication" msgstr "" @@ -23955,15 +23931,9 @@ msgstr "" msgid "Enable user deactivation emails" msgstr "" -msgid "Enable users tab in global search results" -msgstr "" - msgid "Enable version check" msgstr "" -msgid "Enable wiki tab in global search results" -msgstr "" - msgid "EnableReviewApp|Add a job in your CI/CD configuration that:" msgstr "" @@ -51132,6 +51102,9 @@ msgstr "" msgid "Restrict access by IP address" msgstr "" +msgid "Restrict global search to authenticated users" +msgstr "" + msgid "Restrict membership by email domain" msgstr "" @@ -57138,6 +57111,9 @@ msgstr "" msgid "Show closed epics" msgstr "" +msgid "Show code in global search results" +msgstr "" + msgid "Show command" msgstr "" @@ -57150,6 +57126,9 @@ msgstr "" msgid "Show comments only" msgstr "" +msgid "Show commits in global search results" +msgstr "" + msgid "Show complete raw log" msgstr "" @@ -57159,6 +57138,9 @@ msgstr "" msgid "Show details" msgstr "" +msgid "Show epics in global search results" +msgstr "" + msgid "Show file browser" msgstr "" @@ -57171,6 +57153,9 @@ msgstr "" msgid "Show group milestones" msgstr "" +msgid "Show issues in global search results" +msgstr "" + msgid "Show labels" msgstr "" @@ -57180,6 +57165,9 @@ msgstr "" msgid "Show less" msgstr "" +msgid "Show merge requests in global search results" +msgstr "" + msgid "Show more" msgstr "" @@ -57204,6 +57192,9 @@ msgstr "" msgid "Show results" msgstr "" +msgid "Show snippets in global search results" +msgstr "" + msgid "Show sub-group milestones" msgstr "" @@ -57213,9 +57204,15 @@ msgstr "" msgid "Show the Open list" msgstr "" +msgid "Show users in global search results" +msgstr "" + msgid "Show whitespace changes" msgstr "" +msgid "Show wiki in global search results" +msgstr "" + msgid "Showing %d project." msgid_plural "Showing %d projects." msgstr[0] "" @@ -60158,9 +60155,6 @@ msgstr "" msgid "TestCases|Something went wrong while moving test case." msgstr "" -msgid "TestCases|Something went wrong while updating the test case labels." -msgstr "" - msgid "TestCases|Something went wrong while updating the test case." msgstr "" @@ -65031,6 +65025,9 @@ msgstr "" msgid "Use a one-time password authenticator on your mobile device or computer to enable two-factor authentication (2FA)." msgstr "" +msgid "Use advanced search for global search when limited indexing is enabled" +msgstr "" + msgid "Use an existing commit message" msgstr "" diff --git a/spec/helpers/application_settings_helper_spec.rb b/spec/helpers/application_settings_helper_spec.rb index 782b2c39518..28b36e42e42 100644 --- a/spec/helpers/application_settings_helper_spec.rb +++ b/spec/helpers/application_settings_helper_spec.rb @@ -400,11 +400,11 @@ RSpec.describe ApplicationSettingsHelper, feature_category: :shared do it 'returns correctly checked checkboxes' do helper.gitlab_ui_form_for(application_setting, url: search_admin_application_settings_path) do |form| result = helper.global_search_settings_checkboxes(form) - expect(result[0]).to have_checked_field('Enable blocking of anonymous global search requests', with: 1) - expect(result[1]).to have_checked_field('Enable issues tab in global search results', with: 1) - expect(result[2]).not_to have_checked_field('Enable merge requests tab in global search results', with: 1) - expect(result[3]).to have_checked_field('Enable snippet tab in global search results', with: 1) - expect(result[4]).not_to have_checked_field('Enable users tab in global search results', with: 1) + expect(result[0]).to have_checked_field('Restrict global search to authenticated users', with: 1) + expect(result[1]).to have_checked_field('Show issues in global search results', with: 1) + expect(result[2]).not_to have_checked_field('Show merge requests in global search results', with: 1) + expect(result[3]).to have_checked_field('Show snippets in global search results', with: 1) + expect(result[4]).not_to have_checked_field('Show users in global search results', with: 1) end end end