Add latest changes from gitlab-org/gitlab@master

1 files changed, 5 insertions, 4 deletions

diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb
index 679102fcd83..fb0f739934e 100644
--- a/app/helpers/users_helper.rb
+++ b/app/helpers/users_helper.rb
@@ -18,10 +18,11 @@ module UsersHelper
     return _('We also use email for avatar detection if no avatar is uploaded.') unless user.unconfirmed_email.present?
 
     confirmation_link = link_to _('Resend confirmation e-mail'), user_confirmation_path(user: { email: user.unconfirmed_email }), method: :post
-
-    h(_('Please click the link in the confirmation email before continuing. It was sent to ')) +
-      content_tag(:strong) { user.unconfirmed_email } + h('.') +
-      content_tag(:p) { confirmation_link }
+    h(_('Please click the link in the confirmation email before continuing. It was sent to %{html_tag_strong_start}%{email}%{html_tag_strong_end}.')) % {
+      html_tag_strong_start: '<strong>'.html_safe,
+      html_tag_strong_end: '</strong>'.html_safe,
+      email: user.unconfirmed_email
+    } + content_tag(:p) { confirmation_link }
   end
 
   def profile_tabs