summaryrefslogtreecommitdiff
path: root/app/controllers/profiles/gpg_keys_controller.rb
diff options
context:
space:
mode:
authorSimon Knox <psimyn@gmail.com>2018-07-10 13:13:42 +1000
committerSimon Knox <psimyn@gmail.com>2018-07-10 13:13:42 +1000
commitcc40dc852147e12292a1c942b12d01fdefc9e4d1 (patch)
tree8daa619c803f2aa163e07b56198e2173842ed40f /app/controllers/profiles/gpg_keys_controller.rb
parent51aa6098580829a6f6b0623a1559460d99be55be (diff)
parent255db3d59792e9bac92f4327b4e324e2bd32810a (diff)
downloadgitlab-ce-backport-3772-total-weight.tar.gz
Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into backport-3772-total-weightbackport-3772-total-weight
Diffstat (limited to 'app/controllers/profiles/gpg_keys_controller.rb')
-rw-r--r--app/controllers/profiles/gpg_keys_controller.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/controllers/profiles/gpg_keys_controller.rb b/app/controllers/profiles/gpg_keys_controller.rb
index 38e3eacd229..c32507756e8 100644
--- a/app/controllers/profiles/gpg_keys_controller.rb
+++ b/app/controllers/profiles/gpg_keys_controller.rb
@@ -21,7 +21,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController
@gpg_key.destroy
respond_to do |format|
- format.html { redirect_to profile_gpg_keys_url, status: 302 }
+ format.html { redirect_to profile_gpg_keys_url, status: :found }
format.js { head :ok }
end
end
@@ -30,7 +30,7 @@ class Profiles::GpgKeysController < Profiles::ApplicationController
@gpg_key.revoke
respond_to do |format|
- format.html { redirect_to profile_gpg_keys_url, status: 302 }
+ format.html { redirect_to profile_gpg_keys_url, status: :found }
format.js { head :ok }
end
end