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

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

changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml

+---
+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