diff options
| -rw-r--r-- | app/views/admin/application_settings/_ci_cd.html.haml | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/fix-auto-devops-domain-title-on-admin-settings.yml | 5 | ||||
| -rw-r--r-- | locale/gitlab.pot | 3 | ||||
| -rw-r--r-- | spec/features/admin/admin_settings_spec.rb | 2 |
4 files changed, 10 insertions, 2 deletions
diff --git a/app/views/admin/application_settings/_ci_cd.html.haml b/app/views/admin/application_settings/_ci_cd.html.haml index fdaad1cf181..c99d7e9b8e9 100644 --- a/app/views/admin/application_settings/_ci_cd.html.haml +++ b/app/views/admin/application_settings/_ci_cd.html.haml @@ -13,7 +13,7 @@ = 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-group - = f.label :auto_devops_domain, class: 'label-bold' + = f.label :auto_devops_domain, s_('AdminSettings|Auto DevOps domain'), class: 'label-bold' = f.text_field :auto_devops_domain, class: 'form-control', placeholder: 'domain.com' .form-text.text-muted = s_("AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages.") diff --git a/changelogs/unreleased/fix-auto-devops-domain-title-on-admin-settings.yml b/changelogs/unreleased/fix-auto-devops-domain-title-on-admin-settings.yml new file mode 100644 index 00000000000..bb0b193a846 --- /dev/null +++ b/changelogs/unreleased/fix-auto-devops-domain-title-on-admin-settings.yml @@ -0,0 +1,5 @@ +--- +title: Fixes Auto DevOps title on CI/CD admin settings +merge_request: 24249 +author: +type: other diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 2f8a1c8b03d..59e9dd67774 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -450,6 +450,9 @@ msgstr "" msgid "AdminProjects|Delete project" msgstr "" +msgid "AdminSettings|Auto DevOps domain" +msgstr "" + msgid "AdminSettings|Environment variables are protected by default" msgstr "" diff --git a/spec/features/admin/admin_settings_spec.rb b/spec/features/admin/admin_settings_spec.rb index 0a69a26eb3e..04f39b807d7 100644 --- a/spec/features/admin/admin_settings_spec.rb +++ b/spec/features/admin/admin_settings_spec.rb @@ -238,7 +238,7 @@ describe 'Admin updates settings' do page.within('.as-ci-cd') do check 'Default to Auto DevOps pipeline for all projects' - fill_in 'Auto devops domain', with: 'domain.com' + fill_in 'application_setting_auto_devops_domain', with: 'domain.com' click_button 'Save changes' end |