diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-06-03 11:47:45 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-06-03 11:47:45 +0000 |
| commit | 69630394cfb37e5a24c217193af65e88ec288029 (patch) | |
| tree | b5fcab67e90f0a84793cf10b96b32b76ed11a671 | |
| parent | 41d4aaa4be6ef39a97e07dedbeda839b5667f221 (diff) | |
| parent | a38dd9bd3a47f6bbadf00bfa069a46747b0df791 (diff) | |
| download | gitlab-ce-69630394cfb37e5a24c217193af65e88ec288029.tar.gz | |
Merge branch 'add-resend-confirmation-email-in-profile' into 'master'
Add "Resend confirmation e-mail" link in profile settings
Adds a convenience link to resend the confirmation e-mail if necessary. Before, user had to logout or open an Incognito Window to do this.
Screenshot:
Fixes https://github.com/gitlabhq/gitlabhq/issues/9274
See merge request !634
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | app/views/profiles/show.html.haml | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG index 85fa933fa6b..15fa8a37a0d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -18,6 +18,7 @@ v 7.12.0 (unreleased) - Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu) - Fix clone URL losing selection after a single click in Safari and Chrome (Stan Hu) - Fix git blame syntax highlighting when different commits break up lines (Stan Hu) + - Add "Resend confirmation e-mail" link in profile settings (Stan Hu) - Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka) - Disabled expansion of top/bottom blobs for new file diffs - Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka) diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index 62fac46df27..6534afb0e89 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -37,8 +37,11 @@ = f.text_field :email, class: "form-control", required: true - if @user.unconfirmed_email.present? %span.help-block - Please click the link in the confirmation email before continuing, it was sent to - %strong #{@user.unconfirmed_email} + Please click the link in the confirmation email before continuing. It was sent to + = succeed "." do + %strong #{@user.unconfirmed_email} + %p + = link_to "Resend confirmation e-mail", user_confirmation_path(user: { email: @user.unconfirmed_email }), method: :post - else %span.help-block We also use email for avatar detection if no avatar is uploaded. |