diff options
author | Phil Hughes <me@iamphill.com> | 2017-06-23 10:44:10 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2017-06-23 10:44:10 +0100 |
commit | 6fb7fb5c1a44926511914080334774b21a5ee9af (patch) | |
tree | 4fdf8530c98576fd19c306a3c74540998bee9fd0 /app/helpers/users_helper.rb | |
parent | 3b53b553b78d20268d228afa596b53d18046f98e (diff) | |
parent | 801cf92310e9f6950dddba848ef1e6a3d1e48ef0 (diff) | |
download | gitlab-ce-6fb7fb5c1a44926511914080334774b21a5ee9af.tar.gz |
Merge branch 'master' into experimental-top-nav
Diffstat (limited to 'app/helpers/users_helper.rb')
-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 |