summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorJames Edwards-Jones <jedwardsjones@gitlab.com>2019-06-04 16:21:05 +0100
committerJames Edwards-Jones <jedwardsjones@gitlab.com>2019-06-05 19:07:20 +0100
commit866f544c3e29c66ab47ddd9266898cb64d615967 (patch)
tree1509ddd37633ed254ce5cba14ff2ebe5271d6862 /app
parentdbcbfc2638c289307c6e421fa6a5ca48603b1d53 (diff)
downloadgitlab-ce-866f544c3e29c66ab47ddd9266898cb64d615967.tar.gz
Avoid setting Gitlab::Session on sessionless requests
Diffstat (limited to 'app')
-rw-r--r--app/controllers/application_controller.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6e98d66d712..7321f719deb 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -440,6 +440,8 @@ class ApplicationController < ActionController::Base
end
def set_session_storage(&block)
+ return yield if sessionless_user?
+
Gitlab::Session.with_session(session, &block)
end