kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

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
This commit is contained in:
Rémy Coutable 2017-06-02 17:58:27 +00:00
parent 1e8dbd4675 1167a274c1
commit 11852e1638
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/admin/keys_controller.rb
View File

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

5
changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml Normal file
View File

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