summaryrefslogtreecommitdiff
path: root/app/controllers/admin/keys_controller.rb
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2019-11-17 12:06:19 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2019-11-17 12:06:19 +0000
commit190e204decaba9c14f5a5997d243ed007f68b2a1 (patch)
treedfac782883833c6551a559a19543d8e41fd1123e /app/controllers/admin/keys_controller.rb
parent926a77904fe25d533f0e1e503da0317c8f2011c7 (diff)
downloadgitlab-ce-190e204decaba9c14f5a5997d243ed007f68b2a1.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/controllers/admin/keys_controller.rb')
-rw-r--r--app/controllers/admin/keys_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/admin/keys_controller.rb b/app/controllers/admin/keys_controller.rb
index 340eecd7632..58ea19d1210 100644
--- a/app/controllers/admin/keys_controller.rb
+++ b/app/controllers/admin/keys_controller.rb
@@ -17,9 +17,9 @@ class Admin::KeysController < Admin::ApplicationController
respond_to do |format|
if key.destroy
- format.html { redirect_to keys_admin_user_path(user), status: 302, notice: _('User key was successfully removed.') }
+ format.html { redirect_to keys_admin_user_path(user), status: :found, notice: _('User key was successfully removed.') }
else
- format.html { redirect_to keys_admin_user_path(user), status: 302, alert: _('Failed to remove user key.') }
+ format.html { redirect_to keys_admin_user_path(user), status: :found, alert: _('Failed to remove user key.') }
end
end
end