Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
5f95d6d2b0e3
Commit
01186f9f
authored
Oct 15, 2013
by
Dmitriy Zaporozhets
Browse files
Show confirmation status in profile
parent
7aa54e4d4e10
Changes
3
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
5f95d6d2
...
...
@@ -17,6 +17,8 @@ v 6.2.0
- Avatar upload on profile page with a maximum of 200KB (Steven Thonus)
- Store the sessions in Redis instead of the cookie store
- Fixed relative links in markdown
- User must confirm his email if signup enabled
- User must confirm changed email
v 6.1.0
- Project specific IDs for issues, mr, milestones
...
...
app/controllers/admin/users_controller.rb
View file @
5f95d6d2
...
...
@@ -72,6 +72,7 @@ def update
respond_to
do
|
format
|
if
user
.
update_attributes
(
params
[
:user
],
as: :admin
)
user
.
confirm!
format
.
html
{
redirect_to
[
:admin
,
user
],
notice:
'User was successfully updated.'
}
format
.
json
{
head
:ok
}
else
...
...
app/views/profiles/show.html.haml
View file @
5f95d6d2
...
...
@@ -25,7 +25,12 @@
=
f
.
label
:email
,
class:
"control-label"
.controls
=
f
.
text_field
:email
,
class:
"input-xlarge"
,
required:
true
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
-
if
@user
.
unconfirmed_email
.
present?
%span
.help-block
We sent confirmation email to
%strong
#{
@user
.
unconfirmed_email
}
-
else
%span
.help-block
We also use email for avatar detection if no avatar is uploaded.
.control-group
=
f
.
label
:skype
,
class:
"control-label"
.controls
=
f
.
text_field
:skype
,
class:
"input-xlarge"
...
...
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