diff options
Diffstat (limited to 'app/views/admin/application_settings/_ci_cd.html.haml')
| -rw-r--r-- | app/views/admin/application_settings/_ci_cd.html.haml | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index 0af244d54f3..5ae45d5a9da 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -3,15 +3,13 @@ %fieldset .form-group - .card.auto-devops-card - .card-body - .form-check - = f.check_box :auto_devops_enabled, class: 'form-check-input' - = f.label :auto_devops_enabled, class: 'form-check-label' do - = s_('CICD|Default to Auto DevOps pipeline for all projects') - .form-text.text-muted - = s_('CICD|The Auto DevOps pipeline will run if no alternative CI configuration file is found.') - = link_to _('More information'), help_page_path('topics/autodevops/index.md'), target: '_blank' + .form-check + = f.check_box :auto_devops_enabled, class: 'form-check-input' + = f.label :auto_devops_enabled, class: 'form-check-label' do + %strong= s_('CICD|Default to Auto DevOps pipeline for all projects') + .form-text.text-muted + = s_('CICD|The Auto DevOps pipeline runs by default in all projects with no CI/CD configuration file.') + = link_to _('What is Auto DevOps?'), help_page_path('topics/autodevops/index.md'), target: '_blank' .form-group = f.label :auto_devops_domain, s_('AdminSettings|Auto DevOps domain'), class: 'label-bold' = f.text_field :auto_devops_domain, class: 'form-control gl-form-input', placeholder: 'domain.com' @@ -26,9 +24,9 @@ = render_if_exists 'admin/application_settings/shared_runners_minutes_setting', form: f .form-group - = f.label :shared_runners_text, class: 'label-bold' + = f.label :shared_runners_text, _('Shared runners details'), class: 'label-bold' = f.text_area :shared_runners_text, class: 'form-control gl-form-input', rows: 4 - .form-text.text-muted= _("Markdown enabled") + .form-text.text-muted= _("Add a custom message with details about the instance's shared runners. The message is visible in group and project CI/CD settings, in the Runners section. Markdown is supported.") .form-group = f.label :max_artifacts_size, _('Maximum artifacts size (MB)'), class: 'label-bold' = f.number_field :max_artifacts_size, class: 'form-control gl-form-input' @@ -58,14 +56,14 @@ .form-check = f.check_box :protected_ci_variables, class: 'form-check-input' = f.label :protected_ci_variables, class: 'form-check-label' do - = s_('AdminSettings|Environment variables are protected by default') + %strong= s_('AdminSettings|Protect CI/CD variables by default') .form-text.text-muted - = s_('AdminSettings|When creating a new environment variable it will be protected by default.') + = s_('AdminSettings|New CI/CD variables in projects and groups default to protected.') .form-group - = f.label :ci_config_path, _('Default CI configuration path'), class: 'label-bold' + = f.label :ci_config_path, _('Default CI/CD configuration file'), class: 'label-bold' = f.text_field :default_ci_config_path, class: 'form-control gl-form-input', placeholder: '.gitlab-ci.yml' %p.form-text.text-muted - = _("The default CI configuration path for new projects.").html_safe - = link_to sprite_icon('question-o'), help_page_path('ci/pipelines/settings', anchor: 'custom-cicd-configuration-path'), target: '_blank' + = _("The default CI/CD configuration file and path for new projects.").html_safe + = link_to sprite_icon('question-o'), help_page_path('ci/pipelines/settings', anchor: 'custom-cicd-configuration-file'), target: '_blank' = f.submit _('Save changes'), class: "gl-button btn btn-confirm" |