Add latest changes from gitlab-org/gitlab@master

2 files changed, 6 insertions, 0 deletions

diff --git a/app/assets/javascripts/sessions/new/components/update_email.vue b/app/assets/javascripts/sessions/new/components/update_email.vue
index 192b46089ad..124cd671169 100644
--- a/app/assets/javascripts/sessions/new/components/update_email.vue
+++ b/app/assets/javascripts/sessions/new/components/update_email.vue
@@ -5,6 +5,7 @@ import axios from '~/lib/utils/axios_utils';
 import {
   I18N_EMAIL,
   I18N_UPDATE_EMAIL,
+  I18N_UPDATE_EMAIL_GUIDANCE,
   I18N_CANCEL,
   I18N_EMAIL_INVALID,
   I18N_UPDATE_EMAIL_SUCCESS,
@@ -98,6 +99,7 @@ export default {
     email: I18N_EMAIL,
     updateEmail: I18N_UPDATE_EMAIL,
     cancel: I18N_CANCEL,
+    guidance: I18N_UPDATE_EMAIL_GUIDANCE,
   },
 };
 </script>
@@ -117,6 +119,7 @@ export default {
         autofocus
         :state="inputValidation.state"
       />
+      <p class="gl-mt-3 gl-text-secondary">{{ $options.i18n.guidance }}</p>
     </gl-form-group>
     <section class="gl-mt-5">
       <gl-button block variant="confirm" type="submit" :disabled="!inputValidation.state">{{
diff --git a/app/assets/javascripts/sessions/new/constants.js b/app/assets/javascripts/sessions/new/constants.js
index c38829747fb..e9bd26099aa 100644
--- a/app/assets/javascripts/sessions/new/constants.js
+++ b/app/assets/javascripts/sessions/new/constants.js
@@ -15,6 +15,9 @@ export const I18N_GENERIC_ERROR = s__(
 
 export const I18N_EMAIL = __('Email');
 export const I18N_UPDATE_EMAIL = s__('IdentityVerification|Update email');
+export const I18N_UPDATE_EMAIL_GUIDANCE = s__(
+  "EmailVerification|Update your email to a valid permanent address. If you use a temporary email, you won't be able to sign in later.",
+);
 export const I18N_CANCEL = __('Cancel');
 export const I18N_EMAIL_INVALID = s__('IdentityVerification|Please enter a valid email address.');
 export const I18N_UPDATE_EMAIL_SUCCESS = s__(