diff options
| author | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
|---|---|---|
| committer | Jose Ivan Vargas Lopez <jvargas@gitlab.com> | 2017-06-07 23:31:06 +0000 |
| commit | fb80347dc00657ba36576f1f23bd42fdbcf9520a (patch) | |
| tree | 2642ac39cda31e29ea80defdc71e00c89ac8979e /app/controllers/admin/identities_controller.rb | |
| parent | 73924cc51495f5f497114ed9f9de02f8b9c4205b (diff) | |
| parent | 6eb96b2019d392d906a64108dbe83b3ce7cce758 (diff) | |
| download | gitlab-ce-additional-metrics-dashboard.tar.gz | |
Merge branch '28717-additional-metrics-review-branch' into 'additional-metrics-dashboard'additional-metrics-dashboard
# Conflicts:
# app/assets/stylesheets/pages/environments.scss
Diffstat (limited to 'app/controllers/admin/identities_controller.rb')
| -rw-r--r-- | app/controllers/admin/identities_controller.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/identities_controller.rb b/app/controllers/admin/identities_controller.rb index 79a53556f0a..43b4e3a2cc3 100644 --- a/app/controllers/admin/identities_controller.rb +++ b/app/controllers/admin/identities_controller.rb @@ -36,9 +36,9 @@ 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.' + redirect_to admin_user_identities_path(@user), status: 302, notice: 'User identity was successfully removed.' else - redirect_to admin_user_identities_path(@user), alert: 'Failed to remove user identity.' + redirect_to admin_user_identities_path(@user), status: 302, alert: 'Failed to remove user identity.' end end |