diff options
| author | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-18 08:17:48 +0100 |
|---|---|---|
| committer | Achilleas Pipinellis <axilleas@axilleas.me> | 2016-01-18 08:17:48 +0100 |
| commit | 3ecb3024a40882896632ff78789713a4552a19ab (patch) | |
| tree | e2a250e2434edde20f3e64431fc39d77a4d45977 /app/controllers/admin/identities_controller.rb | |
| parent | 07f5a6f107529a932ca7d657a8473cba1afcba05 (diff) | |
| parent | 835f1961e65fe9b4f943b17747b1518c555e8bfd (diff) | |
| download | gitlab-ce-docs_refactor.tar.gz | |
Merge branch 'master' into docs_refactordocs_refactor
Diffstat (limited to 'app/controllers/admin/identities_controller.rb')
| -rw-r--r-- | app/controllers/admin/identities_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb index e383fe38ea6..79a53556f0a 100644 --- a/app/controllers/admin/identities_controller.rb +++ b/app/controllers/admin/identities_controller.rb @@ -26,6 +26,7 @@ class Admin::IdentitiesController < Admin::ApplicationController def update if @identity.update_attributes(identity_params) + RepairLdapBlockedUserService.new(@user).execute redirect_to admin_user_identities_path(@user), notice: 'User identity was successfully updated.' else render :edit @@ -34,6 +35,7 @@ class Admin::IdentitiesController < Admin::ApplicationController def destroy if @identity.destroy + 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.' |