diff options
author | Phil Hughes <me@iamphill.com> | 2017-06-23 08:52:11 +0000 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-06-23 08:52:11 +0000 |
commit | cf131aa4c7f24cd6aa430a33be6afca0a01fab21 (patch) | |
tree | c32f1f0741aab6a2c6ab3135a2a67886413f742b /app/helpers | |
parent | 0c126dc82e57412c4d7f3e72d6c5a20904f27dab (diff) | |
parent | 963052bf3c91100de010feb162cf5aa31ae33128 (diff) | |
download | gitlab-ce-cf131aa4c7f24cd6aa430a33be6afca0a01fab21.tar.gz |
Merge branch '31574-bootstrap-form-builder' into 'master'
Add bootstrap_form gem
See merge request !10985
Diffstat (limited to 'app/helpers')
-rw-r--r-- | app/helpers/users_helper.rb | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 9c623c9ba7c..b5f54d3e154 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -4,4 +4,14 @@ module UsersHelper title: user.email, class: 'has-tooltip commit-committer-link') end + + def user_email_help_text(user) + 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 } + end end |