Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
1167a274
Commit
1167a274
authored
Mar 24, 2017
by
Cyril Jouve
Committed by
Rémy Coutable
Jun 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
redirect to keys index instead of user index after a key is deleted
Signed-off-by:
Rémy Coutable
<
remy@rymai.me
>
parent
42c13b26
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
app/controllers/admin/keys_controller.rb
app/controllers/admin/keys_controller.rb
+2
-2
changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml
changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml
+5
-0
No files found.
app/controllers/admin/keys_controller.rb
View file @
1167a274
...
@@ -15,9 +15,9 @@ class Admin::KeysController < Admin::ApplicationController
...
@@ -15,9 +15,9 @@ class Admin::KeysController < Admin::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
if
key
.
destroy
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
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
end
end
end
...
...
changelogs/unreleased/jouve-gitlab-ce-admin_keys.yml
0 → 100644
View file @
1167a274
---
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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment