Show confirmation status in profile
This commit is contained in:
parent
2e8b0fa5cf
commit
01186f9fc6
|
@ -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
|
||||
|
|
|
@ -72,6 +72,7 @@ class Admin::UsersController < Admin::ApplicationController
|
|||
|
||||
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
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue