diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/dependency_decisions.yml | 7 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 6 |
2 files changed, 13 insertions, 0 deletions
diff --git a/config/dependency_decisions.yml b/config/dependency_decisions.yml index dce1fc1bc45..16f16f77fb9 100644 --- a/config/dependency_decisions.yml +++ b/config/dependency_decisions.yml @@ -570,3 +570,10 @@ :why: https://github.com/codesandbox-app/codesandbox-importers/blob/master/packages/import-utils/LICENSE :versions: [] :when: 2018-08-03 12:23:24.083046000 Z +- - :ignore_group + - devDependencies + - :who: Winnie Hellmann + :why: NPM packages used for development are not distributed with the final product and are therefore + exempt. + :versions: [] + :when: 2018-08-30 12:06:35.668181000 Z diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 6f54bee4713..476eaabfed8 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -1,3 +1,9 @@ +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 + # Custom Queues configuration queues_config_hash = Gitlab::Redis::Queues.params queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE |