Merge branch '338636-only-set-commit-email-with-user-input' into 'master'

Only set User#commit_email with user input

See merge request gitlab-org/gitlab!68591

app/helpers/profiles_helper.rb

@@ -6,6 +6,7 @@ module ProfilesHelper
     verified_emails = user.verified_emails - [private_email]
 
     [
+      [s_('Use primary email (%{email})') % { email: user.email }, ''],
       [s_("Profiles|Use a private email - %{email}").html_safe % { email: private_email }, Gitlab::PrivateCommitEmail::TOKEN],
       *verified_emails
     ]

doc/user/profile/index.md

@@ -219,6 +219,7 @@ To set your time zone:
 A commit email is an email address displayed in every Git-related action carried out through the GitLab interface.
 
 Any of your own verified email addresses can be used as the commit email.
+Your primary email is used by default.
 
 To change your commit email:
 

spec/helpers/profiles_helper_spec.rb

@@ -13,7 +13,8 @@ RSpec.describe ProfilesHelper do
       private_email = user.private_commit_email
 
       emails = [
-        ["Use a private email - #{private_email}", Gitlab::PrivateCommitEmail::TOKEN],
+        [s_('Use primary email (%{email})') % { email: user.email }, ''],
+        [s_("Profiles|Use a private email - %{email}").html_safe % { email: private_email }, Gitlab::PrivateCommitEmail::TOKEN],
         user.email,
         confirmed_email1.email,
         confirmed_email2.email