diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-06-02 17:58:27 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-06-02 17:58:27 +0000 |
| commit | 11852e16387790c26be7b8d1dd99ed689bf9d45b (patch) | |
| tree | fdc9561d55aa01d94dd8884ecd9915470697deb3 /app/controllers | |
| parent | 1e8dbd46758d5c9772baf233ebcff889dc742d3d (diff) | |
| parent | 1167a274c1dae25e1cee1f336fd308d0646ebc51 (diff) | |
| download | gitlab-ce-11852e16387790c26be7b8d1dd99ed689bf9d45b.tar.gz | |
Merge branch 'jouve/gitlab-ce-admin_keys' into 'master'
redirect to keys index instead of user index after a key is deleted
See merge request !11856
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/admin/keys_controller.rb | 4 |
1 files changed, 2 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 |