Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
a38dd9bd
Commit
a38dd9bd
authored
May 10, 2015
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add "Resend confirmation e-mail" link in profile settings
Fixes
https://github.com/gitlabhq/gitlabhq/issues/9274
parent
76ae8719
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
CHANGELOG
CHANGELOG
+1
-0
app/views/profiles/show.html.haml
app/views/profiles/show.html.haml
+5
-2
No files found.
CHANGELOG
View file @
a38dd9bd
...
@@ -17,6 +17,7 @@ v 7.12.0 (unreleased)
...
@@ -17,6 +17,7 @@ v 7.12.0 (unreleased)
- Remove Rack Attack monkey patches and bump to version 4.3.0 (Stan Hu)
- 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 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)
- 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)
- Allow to configure location of the `.gitlab_shell_secret` file. (Jakub Jirutka)
- Disabled expansion of top/bottom blobs for new file diffs
- Disabled expansion of top/bottom blobs for new file diffs
- Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
- Update Asciidoctor gem to version 1.5.2. (Jakub Jirutka)
...
...
app/views/profiles/show.html.haml
View file @
a38dd9bd
...
@@ -37,8 +37,11 @@
...
@@ -37,8 +37,11 @@
=
f
.
text_field
:email
,
class:
"form-control"
,
required:
true
=
f
.
text_field
:email
,
class:
"form-control"
,
required:
true
-
if
@user
.
unconfirmed_email
.
present?
-
if
@user
.
unconfirmed_email
.
present?
%span
.help-block
%span
.help-block
Please click the link in the confirmation email before continuing, it was sent to
Please click the link in the confirmation email before continuing. It was sent to
%strong
#{
@user
.
unconfirmed_email
}
=
succeed
"."
do
%strong
#{
@user
.
unconfirmed_email
}
%p
=
link_to
"Resend confirmation e-mail"
,
user_confirmation_path
(
user:
{
email:
@user
.
unconfirmed_email
}),
method: :post
-
else
-
else
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment