From dfeb60daa607dd96be689cfd3b2f929138efacdf Mon Sep 17 00:00:00 2001 From: Joe Marty Date: Mon, 6 Nov 2017 16:12:40 -0600 Subject: [PATCH] Change Sign Out route from a DELETE to a GET Closes #39708 --- app/views/layouts/header/_default.html.haml | 2 +- changelogs/unreleased/feature-change-signout-route.yml | 5 +++++ config/initializers/devise.rb | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 changelogs/unreleased/feature-change-signout-route.yml diff --git a/app/views/layouts/header/_default.html.haml b/app/views/layouts/header/_default.html.haml index 5ff6ac5fc00..1eca412aff9 100644 --- a/app/views/layouts/header/_default.html.haml +++ b/app/views/layouts/header/_default.html.haml @@ -61,7 +61,7 @@ = link_to "Help", help_path %li.divider %li - = link_to "Sign out", destroy_user_session_path, method: :delete, class: "sign-out-link" + = link_to "Sign out", destroy_user_session_path, class: "sign-out-link" - if session[:impersonator_id] %li.impersonation = link_to admin_impersonation_path, class: 'impersonation-btn', method: :delete, title: "Stop impersonation", aria: { label: 'Stop impersonation' }, data: { toggle: 'tooltip', placement: 'bottom', container: 'body' } do diff --git a/changelogs/unreleased/feature-change-signout-route.yml b/changelogs/unreleased/feature-change-signout-route.yml new file mode 100644 index 00000000000..bccb85b3eaf --- /dev/null +++ b/changelogs/unreleased/feature-change-signout-route.yml @@ -0,0 +1,5 @@ +--- +title: Change 'Sign Out' route from a DELETE to a GET +merge_request: 39708 +author: Joe Marty +type: changed diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index c6ec0aeda7b..958859be6cf 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -195,7 +195,7 @@ Devise.setup do |config| config.navigational_formats = [:"*/*", "*/*", :html, :zip] # The default HTTP method used to sign out a resource. Default is :delete. - config.sign_out_via = :delete + config.sign_out_via = :get # ==> OmniAuth # To configure a new OmniAuth provider copy and edit omniauth.rb.sample