From a2fccf09c15156d980b86aa3986e6ee2d1e6a62a Mon Sep 17 00:00:00 2001
From: Kenneth Chu <ksiuhengchu@gitlab.com>
Date: Tue, 1 Jun 2021 17:45:09 +1000
Subject: [PATCH] Add text stating a primary email address must be used
---
app/views/devise/passwords/new.html.haml | 1 +
locale/gitlab.pot | 3 +++
2 files changed, 4 insertions(+)
diff --git a/app/views/devise/passwords/new.html.haml b/app/views/devise/passwords/new.html.haml
index ef876779ad69..d1db34f68115 100644
--- a/app/views/devise/passwords/new.html.haml
+++ b/app/views/devise/passwords/new.html.haml
@@ -6,6 +6,7 @@
.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.')
+ = _('Must be the primary email address of the GitLab account')
.clearfix
= f.submit _("Reset password"), class: "gl-button btn-confirm btn"
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index cc042d21e089..a665f711136f 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -21639,6 +21639,9 @@ msgstr ""
msgid "Multiple uploaders found: %{uploader_types}"
msgstr ""
+msgid "Must be the primary email address of the GitLab account"
+msgstr ""
+
msgid "Must have a unique policy, status, and elapsed time"
msgstr ""
--
GitLab