diff options
author | James Lopez <james@jameslopez.es> | 2017-09-20 11:00:06 +0200 |
---|---|---|
committer | James Lopez <james@jameslopez.es> | 2017-09-28 08:46:39 +0200 |
commit | 9621dd0c9d31508bdac2e2e226537302b560ef10 (patch) | |
tree | f4e76be89a6cb1a85b04e87cdf33bb408f2bf63f /app/controllers/admin | |
parent | 11c8b8bc3c2294ef2e3a33196619f6e61f1e8d82 (diff) | |
download | gitlab-ce-9621dd0c9d31508bdac2e2e226537302b560ef10.tar.gz |
refactor services to match EE signature
Diffstat (limited to 'app/controllers/admin')
-rw-r--r-- | app/controllers/admin/users_controller.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index cbcef70e957..8b6119548ee 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -128,7 +128,7 @@ class Admin::UsersController < Admin::ApplicationController end respond_to do |format| - result = Users::UpdateService.new(user, user_params_with_pass).execute do |user| + result = Users::UpdateService.new(current_user, user, user_params_with_pass).execute do |user| user.skip_reconfirmation! end @@ -155,7 +155,7 @@ class Admin::UsersController < Admin::ApplicationController def remove_email email = user.emails.find(params[:email_id]) - success = Emails::DestroyService.new(user, email: email.email).execute + success = Emails::DestroyService.new(current_user, user, email: email.email).execute respond_to do |format| if success @@ -219,7 +219,7 @@ class Admin::UsersController < Admin::ApplicationController end def update_user(&block) - result = Users::UpdateService.new(user).execute(&block) + result = Users::UpdateService.new(current_user, user).execute(&block) result[:status] == :success end |