diff --git a/app/helpers/plan_limits_helper.rb b/app/helpers/plan_limits_helper.rb index 218206138d42847b82a8be2189f013d64351ad7e..5bbba8e48c0ab029ee8c05f43081c1ff9d7b4479 100644 --- a/app/helpers/plan_limits_helper.rb +++ b/app/helpers/plan_limits_helper.rb @@ -16,9 +16,9 @@ def plan_limit_setting_description(limit_name) when :ci_needs_size_limit s_('AdminSettings|Maximum number of needs dependencies that a job can have') when :ci_registered_group_runners - s_('AdminSettings|Maximum number of runners registered per group') + s_('AdminSettings|Maximum number of runners created or active in a group during the past seven days') when :ci_registered_project_runners - s_('AdminSettings|Maximum number of runners registered per project') + s_('AdminSettings|Maximum number of runners created or active in a project during the past seven days') when :dotenv_size s_('AdminSettings|Maximum size of a dotenv artifact in bytes') when :dotenv_variables diff --git a/doc/administration/settings/continuous_integration.md b/doc/administration/settings/continuous_integration.md index 905974c6cfc5abf43ffa7bd7666b13dc7784e59e..8695c1f3dafbd5de0b77c0beea4a8c0505cf0496 100644 --- a/doc/administration/settings/continuous_integration.md +++ b/doc/administration/settings/continuous_integration.md @@ -329,8 +329,8 @@ from the **Admin** area: - **Maximum number of pipeline subscriptions to and from a project** - **Maximum number of pipeline schedules** - **Maximum number of needs dependencies that a job can have** - - **Maximum number of runners registered per group** - - **Maximum number of runners registered per project** + - **Maximum number of runners created or active in a group during the past seven days** + - **Maximum number of runners created or active in a project during the past seven days** - **Maximum number of downstream pipelines in a pipeline's hierarchy tree** - **Maximum number of instance-level CI/CD variables** <!-- vale gitlab_base.CurrentStatus = YES --> diff --git a/doc/api/plan_limits.md b/doc/api/plan_limits.md index 25297b4f02c5dbb2d852599a064a527548ac4796..4abe99dbfdf1547e3a2db06a6d5160483505f8e4 100644 --- a/doc/api/plan_limits.md +++ b/doc/api/plan_limits.md @@ -80,8 +80,8 @@ PUT /application/plan_limits | `ci_project_subscriptions` | integer | no | Maximum number of pipeline subscriptions to and from a project. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | | `ci_pipeline_schedules` | integer | no | Maximum number of pipeline schedules. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | | `ci_needs_size_limit` | integer | no | Maximum number of [`needs`](../ci/yaml/needs.md) dependencies that a job can have. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | -| `ci_registered_group_runners` | integer | no | Maximum number of runners registered per group. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | -| `ci_registered_project_runners` | integer | no | Maximum number of runners registered per project. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | +| `ci_registered_group_runners` | integer | no | Maximum number of runners created or active in a group during the past seven days. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | +| `ci_registered_project_runners` | integer | no | Maximum number of runners created or active in a project during the past seven days. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/merge_requests/85895) in GitLab 15.0. | | `dotenv_size` | integer | no | Maximum size of a dotenv artifact in bytes. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/432529) in GitLab 17.1. | | `dotenv_variables` | integer | no | Maximum number of variables in a dotenv artifact. [Introduced](https://gitlab.com/gitlab-org/gitlab/-/issues/432529) in GitLab 17.1. | | `conan_max_file_size` | integer | no | Maximum Conan package file size in bytes. | diff --git a/lib/api/admin/plan_limits.rb b/lib/api/admin/plan_limits.rb index 0795e686dbb3695f55cdecdfa788966bbbfbc0e1..29c4bf660ad277e48fe4e63dcd975af7e41f3f50 100644 --- a/lib/api/admin/plan_limits.rb +++ b/lib/api/admin/plan_limits.rb @@ -59,8 +59,10 @@ def current_plan(name) desc: 'Maximum number of pipeline subscriptions to and from a project' optional :ci_pipeline_schedules, type: Integer, desc: 'Maximum number of pipeline schedules' optional :ci_needs_size_limit, type: Integer, desc: 'Maximum number of needs dependencies that a job can have' - optional :ci_registered_group_runners, type: Integer, desc: 'Maximum number of runners registered per group' - optional :ci_registered_project_runners, type: Integer, desc: 'Maximum number of runners registered per project' + optional :ci_registered_group_runners, type: Integer, + desc: 'Maximum number of runners created or active in a group during the past seven days' + optional :ci_registered_project_runners, type: Integer, + desc: 'Maximum number of runners created or active in a project during the past seven days' optional :conan_max_file_size, type: Integer, desc: 'Maximum Conan package file size in bytes' optional :dotenv_size, type: Integer, desc: 'Maximum size of a dotenv artifact in bytes' optional :dotenv_variables, type: Integer, desc: 'Maximum number of variables in a dotenv artifact' diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 84c9c8ab28ce0850b23f656838c5e6f6c7faf4ee..02db7cf4a827d976284fab7f09fd3709c0ca31a1 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -4279,10 +4279,10 @@ msgstr "" msgid "AdminSettings|Maximum number of pipeline subscriptions to and from a project" msgstr "" -msgid "AdminSettings|Maximum number of runners registered per group" +msgid "AdminSettings|Maximum number of runners created or active in a group during the past seven days" msgstr "" -msgid "AdminSettings|Maximum number of runners registered per project" +msgid "AdminSettings|Maximum number of runners created or active in a project during the past seven days" msgstr "" msgid "AdminSettings|Maximum number of variables in a dotenv artifact" diff --git a/spec/views/admin/application_settings/_ci_cd.html.haml_spec.rb b/spec/views/admin/application_settings/_ci_cd.html.haml_spec.rb index 52fbd69da51b40b93e35e764551259a98981247a..4c3599297b55c11675e230a826af7898186ae6e4 100644 --- a/spec/views/admin/application_settings/_ci_cd.html.haml_spec.rb +++ b/spec/views/admin/application_settings/_ci_cd.html.haml_spec.rb @@ -69,11 +69,17 @@ expect(rendered).to have_field('Maximum number of needs dependencies that a job can have', type: 'number') expect(page.find_field('Maximum number of needs dependencies that a job can have').value).to eq('50') - expect(rendered).to have_field('Maximum number of runners registered per group', type: 'number') - expect(page.find_field('Maximum number of runners registered per group').value).to eq('60') + expect(rendered).to have_field( + 'Maximum number of runners created or active in a group during the past seven days', type: 'number') + expect( + page.find_field('Maximum number of runners created or active in a group during the past seven days').value + ).to eq('60') - expect(rendered).to have_field('Maximum number of runners registered per project', type: 'number') - expect(page.find_field('Maximum number of runners registered per project').value).to eq('70') + expect(rendered).to have_field( + 'Maximum number of runners created or active in a project during the past seven days', type: 'number') + expect( + page.find_field('Maximum number of runners created or active in a project during the past seven days').value + ).to eq('70') expect(rendered).to have_field( "Maximum number of downstream pipelines in a pipeline's hierarchy tree", type: 'number'