Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 21:25:58 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2021-06-16 21:25:58 +0300
commita5f4bba440d7f9ea47046a0a561d49adf0a1e6d4 (patch)
treefb69158581673816a8cd895f9d352dcb3c678b1e /app/views/devise/confirmations/almost_there.haml
parentd16b2e8639e99961de6ddc93909f3bb5c1445ba1 (diff)
Add latest changes from gitlab-org/gitlab@14-0-stable-eev14.0.0-rc42
Diffstat (limited to 'app/views/devise/confirmations/almost_there.haml')
-rw-r--r--app/views/devise/confirmations/almost_there.haml6
1 files changed, 4 insertions, 2 deletions
diff --git a/app/views/devise/confirmations/almost_there.haml b/app/views/devise/confirmations/almost_there.haml
index 684af933f3a..037b2f247c1 100644
--- a/app/views/devise/confirmations/almost_there.haml
+++ b/app/views/devise/confirmations/almost_there.haml
@@ -1,8 +1,10 @@
+- user_email = "(#{params[:email]})" if params[:email].present?
+
.well-confirmation.gl-text-center.gl-mb-6
%h1.gl-mt-0
= _("Almost there...")
%p.lead.gl-mb-6
- = _("Please check your email to confirm your account")
+ = _('Please check your email %{email} to confirm your account') % { email: user_email }
%hr
- if Gitlab::CurrentSettings.after_sign_up_text.present?
.well-confirmation.gl-text-center
@@ -10,5 +12,5 @@
%p.text-center
= _("No confirmation email received? Please check your spam folder or")
.gl-mb-6.prepend-top-20.gl-text-center
- %a.btn.gl-button.btn-confirm{ href: new_user_confirmation_path }
+ %a.gl-link{ href: new_user_confirmation_path }
= _("Request new confirmation email")