diff options
| author | Cyril Jouve <jv.cyril@gmail.com> | 2017-03-24 20:29:11 +0100 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-01 18:41:36 +0200 |
| commit | 1167a274c1dae25e1cee1f336fd308d0646ebc51 (patch) | |
| tree | 23b1c73ccbe8d63dd56a4fcfc41363457e6ac7b6 | |
| parent | 42c13b26dab4f52e90bc8be2b6f46d2ef9559ccd (diff) | |
| download | gitlab-ce-jouve/gitlab-ce-admin_keys.tar.gz | |
redirect to keys index instead of user index after a key is deletedjouve/gitlab-ce-admin_keys
Signed-off-by: Rémy Coutable <remy@rymai.me>
| -rw-r--r-- | app/controllers/admin/keys_controller.rb | 4 | ||||
| -rw-r--r-- | changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/app/controllers/admin/keys_controller.rb b/app/controllers/admin/keys_controller.rb index 054bb52b696..299419fb509 100644 --- a/app/controllers/admin/keys_controller.rb +++ b/app/controllers/admin/keys_controller.rb @@ -15,9 +15,9 @@ class Admin::KeysController < Admin::ApplicationController respond_to do |format| if key.destroy - format.html { redirect_to [:admin, user], notice: 'User key was successfully removed.' } + format.html { redirect_to keys_admin_user_path(user), notice: 'User key was successfully removed.' } else - format.html { redirect_to [:admin, user], alert: 'Failed to remove user key.' } + format.html { redirect_to keys_admin_user_path(user), alert: 'Failed to remove user key.' } end end end diff --git a/changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml b/changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml new file mode 100644 index 00000000000..df4de9f4e21 --- /dev/null +++ b/changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml @@ -0,0 +1,5 @@ +--- +title: Redirect to user's keys index instead of user's index after a key is deleted + in the admin +merge_request: 10227 +author: Cyril Jouve |