summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-06-22 11:37:36 +0200
committerJames Lopez <james@jameslopez.es>2017-06-23 11:41:42 +0200
commit4c75fe5dfe898b7c4882c88364df936460891e2a (patch)
tree9f85d8415827ee71695d37aab9b2d944c59ed772
parentc9fd3dc42c462ce2551f6a9630035b4df00bc366 (diff)
downloadgitlab-ce-4c75fe5dfe898b7c4882c88364df936460891e2a.tar.gz
add missing action to block
-rw-r--r--app/controllers/admin/users_controller.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 73fa21d3b3c..97ae68495c7 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -125,9 +125,9 @@ class Admin::UsersController < Admin::ApplicationController
end
respond_to do |format|
- user.skip_reconfirmation!
-
- result = Users::UpdateService.new(current_user, user, user_params_with_pass).execute
+ result = Users::UpdateService.new(current_user, user, user_params_with_pass).execute do |user|
+ user.skip_reconfirmation!
+ end
if result[:status] == :success
format.html { redirect_to [:admin, user], notice: 'User was successfully updated.' }