summaryrefslogtreecommitdiff
path: root/app/controllers/admin
diff options
context:
space:
mode:
authorGabriel Mazetto <gabriel@gitlab.com>2016-01-07 14:01:01 -0200
committerGabriel Mazetto <gabriel@gitlab.com>2016-01-08 16:26:04 -0200
commit47e4613f4adc2d6ef4b066a87ec772ef8044bdd5 (patch)
tree7abd1329e62dd97657dce22ad83f9500817c0d42 /app/controllers/admin
parentec67e9be1d7486199b47e19c766202a8bfdefe93 (diff)
downloadgitlab-ce-47e4613f4adc2d6ef4b066a87ec772ef8044bdd5.tar.gz
Code style fixes and some code simplified
Diffstat (limited to 'app/controllers/admin')
-rw-r--r--app/controllers/admin/identities_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb
index 9ba10487512..79a53556f0a 100644
--- a/app/controllers/admin/identities_controller.rb
+++ b/app/controllers/admin/identities_controller.rb
@@ -26,7 +26,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
def update
if @identity.update_attributes(identity_params)
- RepairLdapBlockedUserService.new(@user, @identity).execute
+ RepairLdapBlockedUserService.new(@user).execute
redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.'
else
render :edit
@@ -35,7 +35,7 @@ class Admin::IdentitiesController < Admin::ApplicationController
def destroy
if @identity.destroy
- RepairLdapBlockedUserService.new(@user, @identity).execute
+ RepairLdapBlockedUserService.new(@user).execute
redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully removed.'
else
redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.'