summaryrefslogtreecommitdiff
path: root/app/controllers
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-15 11:19:19 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2013-10-15 11:19:19 +0300
commit01186f9fc6f5f5645ea5406ce571f83db0dc080a (patch)
tree5771123265a9d0d6bdabdc79472c186e6a581c8e /app/controllers
parent2e8b0fa5cf9e70c55bd1dbb254db3f9aa45b23e9 (diff)
downloadgitlab-ce-01186f9fc6f5f5645ea5406ce571f83db0dc080a.tar.gz
Show confirmation status in profile
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/admin/users_controller.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 076c5f0ba58..dccbfa2f709 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -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