summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorJames Lopez <james@jameslopez.es>2017-06-16 10:29:43 +0200
committerJames Lopez <james@jameslopez.es>2017-06-23 11:41:41 +0200
commitbf3a3f3652704fb261e6220e2199830ea22ec8d3 (patch)
treeb23c8967fecea041bd01c7065676ef33dd9b385c /app/controllers/admin
parent36bc2e9016b5c27e6a7afbb78235b5006d3bc9cc (diff)
downloadgitlab-ce-bf3a3f3652704fb261e6220e2199830ea22ec8d3.tar.gz
fix api and controller issues
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/users_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb
index 41fe359b590..754d9209138 100644
--- a/app/controllers/admin/users_controller.rb
+++ b/app/controllers/admin/users_controller.rb
@@ -154,7 +154,7 @@ class Admin::UsersController < Admin::ApplicationController
email = user.emails.find(params[:email_id])
email.destroy
- result = Users::UpdateService.new(current_user, @user).execute do
+ result = Users::UpdateService.new(current_user, @user).execute do |user|
user.update_secondary_emails!
end
@@ -215,7 +215,7 @@ class Admin::UsersController < Admin::ApplicationController
end
def update_user
- result = Users::UpdateService.new(current_user, user).execute do
+ result = Users::UpdateService.new(current_user, user).execute do |user|
yield(user)
end