Merge branch 'default-branch-name-setting' into 'master'

Improve UI text for initial branch name setting

See merge request gitlab-org/gitlab!65402

app/views/admin/application_settings/_initial_branch_name.html.haml

@@ -8,6 +8,6 @@
       = f.label :default_branch_name, _('Default initial branch name'), class: 'label-light'
       = f.text_field :default_branch_name, placeholder: Gitlab::DefaultBranch.value, class: 'form-control gl-form-input'
       %span.form-text.text-muted
-        = (_("Changes affect new repositories only. If not specified, Git's default name %{branch_name_default} will be used.") % { branch_name_default: fallback_branch_name } ).html_safe
+        = (s_("AdminSettings|If not specified at the group or instance level, the default is %{default_initial_branch_name}. Does not affect existing repositories.") % { default_initial_branch_name: fallback_branch_name } ).html_safe
 
   = f.submit _('Save changes'), class: 'gl-button btn-confirm'

app/views/admin/application_settings/repository.html.haml

@@ -9,7 +9,7 @@
     %button.btn.gl-button.btn-default.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Set the default name of the initial branch when creating new repositories through the user interface.')
+      = s_('AdminSettings|The default name for the initial branch of new repositories created in the instance.')
   .settings-content
     = render 'initial_branch_name'
 

app/views/groups/settings/repository/_initial_branch_name.html.haml

@@ -5,7 +5,7 @@
     %button.gl-button.js-settings-toggle{ type: 'button' }
       = expanded_by_default? ? _('Collapse') : _('Expand')
     %p
-      = _('Set the default name of the initial branch when creating new repositories through the user interface.')
+      = s_('GroupSettings|The default name for the initial branch of new repositories created in the group.')
   .settings-content
     = form_for @group, url: group_path(@group, anchor: 'js-default-branch-name'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@group)
@@ -16,7 +16,7 @@
           = f.label :default_branch_name, _('Default initial branch name'), class: 'label-light'
           = f.text_field :default_branch_name, value: group.namespace_settings&.default_branch_name, placeholder: Gitlab::DefaultBranch.value(object: @group), class: 'form-control'
           %span.form-text.text-muted
-            = (_("Changes affect new repositories only. If not specified, either the configured application-wide default or Git's default name %{branch_name_default} will be used.") % { branch_name_default: fallback_branch_name }).html_safe
+            = (s_("GroupSettings|If not specified at the group or instance level, the default is %{default_initial_branch_name}. Does not affect existing repositories.") % { default_initial_branch_name: fallback_branch_name }).html_safe
 
       = f.hidden_field :redirect_target, value: "repository_settings"
       = f.submit _('Save changes'), class: 'btn gl-button btn-confirm'

locale/gitlab.pot

@@ -2368,6 +2368,9 @@ msgstr ""
 msgid "AdminSettings|Feed token"
 msgstr ""
+msgid "AdminSettings|If not specified at the group or instance level, the default is %{default_initial_branch_name}. Does not affect existing repositories."
+msgstr ""
+
 msgid "AdminSettings|Keep the latest artifacts for all jobs in the latest successful pipelines"
 msgstr ""
@@ -2410,6 +2413,9 @@ msgstr ""
 msgid "AdminSettings|Specify a domain to use by default for every project's Auto Review Apps and Auto Deploy stages."
 msgstr ""
+msgid "AdminSettings|The default name for the initial branch of new repositories created in the instance."
+msgstr ""
+
 msgid "AdminSettings|The latest artifacts for all jobs in the most recent successful pipelines in each project are stored and do not expire."
 msgstr ""
@@ -6220,12 +6226,6 @@ msgstr ""
 msgid "Changes"
 msgstr ""
-msgid "Changes affect new repositories only. If not specified, Git's default name %{branch_name_default} will be used."
-msgstr ""
-
-msgid "Changes affect new repositories only. If not specified, either the configured application-wide default or Git's default name %{branch_name_default} will be used."
-msgstr ""
-
 msgid "Changes are shown as if the %{b_open}source%{b_close} revision was being merged into the %{b_open}target%{b_close} revision."
 msgstr ""
@@ -15760,6 +15760,9 @@ msgstr ""
 msgid "GroupSettings|Export group"
 msgstr ""
+msgid "GroupSettings|If not specified at the group or instance level, the default is %{default_initial_branch_name}. Does not affect existing repositories."
+msgstr ""
+
 msgid "GroupSettings|If the parent group's visibility is lower than the group current visibility, visibility levels for subgroups and projects will be changed to match the new parent group's visibility."
 msgstr ""
@@ -15799,6 +15802,9 @@ msgstr ""
 msgid "GroupSettings|The Auto DevOps pipeline runs if no alternative CI configuration file is found."
 msgstr ""
+msgid "GroupSettings|The default name for the initial branch of new repositories created in the group."
+msgstr ""
+
 msgid "GroupSettings|There was a problem updating Auto DevOps pipeline: %{error_messages}."
 msgstr ""
@@ -29696,9 +29702,6 @@ msgstr ""
 msgid "Set the default expiration time for each job's artifacts. 0 for unlimited. The default unit is in seconds, but you can define an alternative. For example: %{code_open}4 mins 2 sec%{code_close}, %{code_open}2h42min%{code_close}."
 msgstr ""
-msgid "Set the default name of the initial branch when creating new repositories through the user interface."
-msgstr ""
-
 msgid "Set the due date to %{due_date}."
 msgstr ""

spec/features/groups/settings/repository_spec.rb

@@ -38,7 +38,7 @@
     it 'renders the correct setting section content' do
       within("#js-default-branch-name") do
         expect(page).to have_content("Default initial branch name")
-        expect(page).to have_content("Set the default name of the initial branch when creating new repositories through the user interface.")
+        expect(page).to have_content("The default name for the initial branch of new repositories created in the group.")
       end
     end
   end

spec/views/admin/application_settings/repository.html.haml_spec.rb

@@ -22,7 +22,7 @@
       render
 
       expect(rendered).to have_content("Default initial branch name")
-      expect(rendered).to have_content("Set the default name of the initial branch when creating new repositories through the user interface.")
+      expect(rendered).to have_content("The default name for the initial branch of new repositories created in the instance.")
     end
   end
 end