diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-18 00:10:36 +0000 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2023-03-18 00:10:36 +0000 |
| commit | 4eee0fe3f55ecdd5d607202d93508259239b590f (patch) | |
| tree | 87bfbb30e6e98ae4135221d562515888e919ec10 /app/views/admin | |
| parent | 0ad8135c1feeefa23ec883e409fb65b8b52882a1 (diff) | |
| download | gitlab-ce-4eee0fe3f55ecdd5d607202d93508259239b590f.tar.gz | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/views/admin')
| -rw-r--r-- | app/views/admin/application_settings/_runner_registrars_form.html.haml | 11 | ||||
| -rw-r--r-- | app/views/admin/application_settings/ci_cd.html.haml | 2 |
2 files changed, 12 insertions, 1 deletions
diff --git a/app/views/admin/application_settings/_runner_registrars_form.html.haml b/app/views/admin/application_settings/_runner_registrars_form.html.haml index baf7c5de7b9..53832e93ed2 100644 --- a/app/views/admin/application_settings/_runner_registrars_form.html.haml +++ b/app/views/admin/application_settings/_runner_registrars_form.html.haml @@ -2,7 +2,18 @@ = form_errors(@application_setting) %fieldset + .form-group + %h5 + = s_('Runners|Runner version management') + %span.form-text.gl-mb-3.gl-mt-0 + - help_text = s_('Runners|Official runner version data is periodically fetched from GitLab.com to determine whether the runners need upgrades.') + - learn_more_link = link_to _('Learn more.'), help_page_path('ci/runners/configure_runners.md', anchor: 'determine-which-runners-need-to-be-upgraded'), target: '_blank', rel: 'noopener noreferrer' + = f.gitlab_ui_checkbox_component :update_runner_versions_enabled, + s_('Runners|Fetch GitLab Runner release version data from GitLab.com'), + help_text: '%{help_text} %{learn_more_link}'.html_safe % { help_text: help_text, learn_more_link: learn_more_link } .gl-form-group + %h5 + = s_('Runners|Runner registration') %span.form-text.gl-mb-3.gl-mt-0 = s_('Runners|If both settings are disabled, new runners cannot be registered.') = link_to _('Learn more.'), help_page_path('user/admin_area/settings/continuous_integration', anchor: 'restrict-runner-registration-by-all-users-in-an-instance'), target: '_blank', rel: 'noopener noreferrer' diff --git a/app/views/admin/application_settings/ci_cd.html.haml b/app/views/admin/application_settings/ci_cd.html.haml index a7119af7ece..c2dc3c3707e 100644 --- a/app/views/admin/application_settings/ci_cd.html.haml +++ b/app/views/admin/application_settings/ci_cd.html.haml @@ -41,7 +41,7 @@ %section.settings.as-runner.no-animate#js-runner-settings{ class: ('expanded' if expanded_by_default?) } .settings-header %h4.settings-title.js-settings-toggle.js-settings-toggle-trigger-only - = s_('Runners|Runner registration') + = s_('Runners|Runners') = render Pajamas::ButtonComponent.new(button_options: { class: 'js-settings-toggle' }) do = expanded_by_default? ? 'Collapse' : 'Expand' .settings-content |