Merge branch 'id-rename-main-to-master-in-views' into 'master'

Rename master to main in views placeholders

See merge request gitlab-org/gitlab!61252

app/helpers/notify_helper.rb

@@ -18,7 +18,7 @@ module NotifyHelper
     when "Developer"
       s_("InviteEmail|As a developer, you have full access to projects, so you can take an idea from concept to production.")
     when "Maintainer"
-      s_("InviteEmail|As a maintainer, you have full access to projects. You can push commits to master and deploy to production.")
+      s_("InviteEmail|As a maintainer, you have full access to projects. You can push commits to the default branch and deploy to production.")
     when "Owner"
       s_("InviteEmail|As an owner, you have full access to projects and can manage access to the group, including inviting new members.")
     when "Minimal Access"

app/models/project.rb

@@ -2539,7 +2539,7 @@ class Project < ApplicationRecord
   def default_branch_or_main
     return default_branch if default_branch
 
-    Gitlab::DefaultBranch.value(project: self)
+    Gitlab::DefaultBranch.value(object: self)
   end
 
   def ci_config_path_or_default

app/models/snippet.rb

@@ -315,7 +315,7 @@ class Snippet < ApplicationRecord
 
   override :default_branch
   def default_branch
-    super || Gitlab::DefaultBranch.value(project: project)
+    super || Gitlab::DefaultBranch.value(object: project)
   end
 
   def repository_storage

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

 = form_for @application_setting, url: general_admin_application_settings_path(anchor: 'js-default-branch-name'), html: { class: 'fieldset-form' } do |f|
   = form_errors(@application_setting)
 
-  - fallback_branch_name = '<code>master</code>'
+  - fallback_branch_name = "<code>#{Gitlab::DefaultBranch.value}</code>"
 
   %fieldset
     .form-group
       = f.label :default_branch_name, _('Default initial branch name'), class: 'label-light'
-      = f.text_field :default_branch_name, placeholder: 'master', class: 'form-control gl-form-input'
+      = 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
 

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

@@ -9,12 +9,12 @@
   .settings-content
     = form_for @group, url: group_path(@group, anchor: 'js-default-branch-name'), html: { class: 'fieldset-form' } do |f|
       = form_errors(@group)
-      - fallback_branch_name = '<code>master</code>'
+      - fallback_branch_name = "<code>#{Gitlab::DefaultBranch.value(object: @group)}</code>"
 
       %fieldset
         .form-group
           = 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: 'master', class: 'form-control'
+          = 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
 

app/views/projects/compare/index.html.haml

@@ -4,11 +4,11 @@
 %h3.page-title
   = _("Compare Git revisions")
 .sub-header-block
-  - example_master = capture do
-    %code.ref-name master
+  - example_branch = capture do
+    %code.ref-name= @project.default_branch_or_main
   - example_sha = capture do
     %code.ref-name 4eedf23
-  = html_escape(_("Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.")) % { master: example_master.html_safe, sha: example_sha.html_safe }
+  = html_escape(_("Choose a branch/tag (e.g. %{branch}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request.")) % { branch: example_branch.html_safe, sha: example_sha.html_safe }
   %br
   = html_escape(_("Changes are shown as if the %{b_open}source%{b_close} revision was being merged into the %{b_open}target%{b_close} revision.")) % { b_open: '<b>'.html_safe, b_close: '</b>'.html_safe }
 

changelogs/unreleased/id-rename-main-to-master-in-views.yml

+---
+title: Rename master to main in views placeholders
+merge_request: 61252
+author:
+type: changed

lib/gitlab/default_branch.rb

@@ -3,8 +3,8 @@
 # Class is used while we're migrating from master to main
 module Gitlab
   module DefaultBranch
-    def self.value(project: nil)
-      Feature.enabled?(:main_branch_over_master, project, default_enabled: :yaml) ? 'main' : 'master'
+    def self.value(object: nil)
+      Feature.enabled?(:main_branch_over_master, object, default_enabled: :yaml) ? 'main' : 'master'
     end
   end
 end

locale/gitlab.pot

@@ -6334,7 +6334,7 @@ msgstr ""
 msgid "Choose File..."
 msgstr ""
 
-msgid "Choose a branch/tag (e.g. %{master}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request."
+msgid "Choose a branch/tag (e.g. %{branch}) or enter a commit (e.g. %{sha}) to see what's changed or to create a merge request."
 msgstr ""
 
 msgid "Choose a file"
@@ -17894,7 +17894,7 @@ msgstr ""
 msgid "InviteEmail|As a guest, you can view projects, leave comments, and create issues."
 msgstr ""
 
-msgid "InviteEmail|As a maintainer, you have full access to projects. You can push commits to master and deploy to production."
+msgid "InviteEmail|As a maintainer, you have full access to projects. You can push commits to the default branch and deploy to production."
 msgstr ""
 
 msgid "InviteEmail|As a reporter, you can view projects and reports, and leave comments on issues."