Automatic merge of gitlab-org/gitlab-ce master

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.")

changelogs/unreleased/fix-auto-devops-domain-title-on-admin-settings.yml

+---
+title: Fixes Auto DevOps title on CI/CD admin settings
+merge_request: 24249
+author:
+type: other

locale/gitlab.pot

@@ -551,6 +551,9 @@ msgstr ""
 msgid "AdminProjects|Delete project"
 msgstr ""
 
+msgid "AdminSettings|Auto DevOps domain"
+msgstr ""
+
 msgid "AdminSettings|Environment variables are protected by default"
 msgstr ""
 

spec/features/admin/admin_settings_spec.rb

@@ -263,7 +263,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