Merge branch 'kc-forgot-password-primary-email-text' into 'master'

Add text stating a primary email address must be used

See merge request gitlab-org/gitlab!62882

app/views/devise/passwords/new.html.haml

@@ -6,6 +6,8 @@
       .form-group
         = f.label :email
         = f.email_field :email, class: "form-control gl-form-input", required: true, value: params[:user_email], autofocus: true, title: _('Please provide a valid email address.')
+        .form-text.text-muted
+          = _('Requires your primary GitLab email address.')
       .clearfix
         = f.submit _("Reset password"), class: "gl-button btn-confirm btn"
 

locale/gitlab.pot

@@ -27990,6 +27990,9 @@ msgstr[1] ""
 msgid "Requires values to meet regular expression requirements."
 msgstr ""
 
+msgid "Requires your primary GitLab email address."
+msgstr ""
+
 msgid "Resend"
 msgstr ""