diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-08 12:28:50 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-08 12:28:50 +0300 |
| commit | b579cc7620dad1d406e974cce2d9ad5a4ce58a57 (patch) | |
| tree | f377a0458e3d57b7fe76e3a35a33430da9c9ff45 /lib/gitlab/middleware | |
| parent | f2f58a60b76acd479e37bdbc9246ec9f9b2bea82 (diff) | |
| parent | 4dea7944c46287707b6b65ca10e0af0b69a57a21 (diff) | |
Merge branch 'feature-change-signout-route' into 'master'
Change Sign Out route from a DELETE to a GET
Closes #39708
See merge request gitlab-org/gitlab-ce!15231
Diffstat (limited to 'lib/gitlab/middleware')
| -rw-r--r-- | lib/gitlab/middleware/read_only.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/gitlab/middleware/read_only.rb b/lib/gitlab/middleware/read_only.rb index 8853dfa3d2d..5e4932e4e57 100644 --- a/lib/gitlab/middleware/read_only.rb +++ b/lib/gitlab/middleware/read_only.rb @@ -66,11 +66,7 @@ module Gitlab end def whitelisted_routes - logout_route || grack_route || @whitelisted.any? { |path| request.path.include?(path) } || lfs_route || sidekiq_route - end - - def logout_route - route_hash[:controller] == 'sessions' && route_hash[:action] == 'destroy' + grack_route || @whitelisted.any? { |path| request.path.include?(path) } || lfs_route || sidekiq_route end def sidekiq_route |