diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 15:07:41 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-01-14 15:07:41 +0300 |
commit | 4ce0bee95df15c05cdb0d777eba31fe753bc443b (patch) | |
tree | 3dc6a1aae7e0a01280f6d9f7d774dd369f7863e1 /config | |
parent | 02ab65d49fc94be7c91e511899762236c122977d (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config')
-rw-r--r-- | config/initializers/8_devise.rb | 2 | ||||
-rw-r--r-- | config/routes/admin.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/8_devise.rb b/config/initializers/8_devise.rb index 8d4c5fa382c..e1c37caaafd 100644 --- a/config/initializers/8_devise.rb +++ b/config/initializers/8_devise.rb @@ -203,7 +203,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 = :get + config.sign_out_via = :post # ==> OmniAuth # To configure a new OmniAuth provider copy and edit omniauth.rb.sample diff --git a/config/routes/admin.rb b/config/routes/admin.rb index 45cca1d3191..f363823f80c 100644 --- a/config/routes/admin.rb +++ b/config/routes/admin.rb @@ -24,7 +24,7 @@ namespace :admin do end resource :session, only: [:new, :create] do - get 'destroy', action: :destroy, as: :destroy + post 'destroy', action: :destroy, as: :destroy end resource :impersonation, only: :destroy |