summaryrefslogtreecommitdiff
path: root/config/initializers_before_autoloader
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-10-04 12:11:58 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-10-04 12:11:58 +0000
commit0327ce54a7e315b3aa6f80cc4e540fbb6792f2e3 (patch)
treef27611f4cc36d1aa9215e5bd0ff4787e60e77bd0 /config/initializers_before_autoloader
parent266aad4e70f3c642583ab60894b27b2622095cd8 (diff)
downloadgitlab-ce-0327ce54a7e315b3aa6f80cc4e540fbb6792f2e3.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers_before_autoloader')
-rw-r--r--config/initializers_before_autoloader/002_sidekiq.rb4
1 files changed, 0 insertions, 4 deletions
diff --git a/config/initializers_before_autoloader/002_sidekiq.rb b/config/initializers_before_autoloader/002_sidekiq.rb
index 8e2def08279..9ffcf39d6fb 100644
--- a/config/initializers_before_autoloader/002_sidekiq.rb
+++ b/config/initializers_before_autoloader/002_sidekiq.rb
@@ -8,10 +8,6 @@
require 'sidekiq/web'
-# Disable the Sidekiq Rack session since GitLab already has its own session store.
-# CSRF protection still works (https://github.com/mperham/sidekiq/commit/315504e766c4fd88a29b7772169060afc4c40329).
-Sidekiq::Web.set :sessions, false
-
if Rails.env.development?
Sidekiq.default_worker_options[:backtrace] = true
end