diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 21:13:03 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2022-09-20 21:13:03 +0300 |
| commit | 29f6c0bff81cae77435342e46d1f439ac16a57d1 (patch) | |
| tree | 9e48603e2818e9c56ac937743fd23f1d0fcf6529 /config/initializers | |
| parent | b962adf4c32f2371ad0d8bfcdc444933943d3cd9 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/omniauth.rb | 2 | ||||
| -rw-r--r-- | config/initializers/sidekiq.rb | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 2454b5ea818..49eeadf3b9f 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -27,7 +27,7 @@ OmniAuth.config.full_host = Gitlab::OmniauthInitializer.full_host OmniAuth.config.allowed_request_methods = [:post] # In case of auto sign-in, the GET method is used (users don't get to click on a button) OmniAuth.config.allowed_request_methods << :get if Gitlab.config.omniauth.auto_sign_in_with_provider.present? -OmniAuth.config.before_request_phase do |env| +OmniAuth.config.request_validation_phase do |env| Gitlab::RequestForgeryProtection.call(env) end diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index 262ef1dea21..63e8dfe2671 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -23,8 +23,6 @@ queues_config_hash[:namespace] = Gitlab::Redis::Queues::SIDEKIQ_NAMESPACE enable_json_logs = Gitlab.config.sidekiq.log_format == 'json' enable_sidekiq_memory_killer = ENV['SIDEKIQ_MEMORY_KILLER_MAX_RSS'].to_i.nonzero? -use_sidekiq_daemon_memory_killer = ENV.fetch("SIDEKIQ_DAEMON_MEMORY_KILLER", 1).to_i.nonzero? -use_sidekiq_legacy_memory_killer = !use_sidekiq_daemon_memory_killer Sidekiq.configure_server do |config| config.options[:strict] = false @@ -45,8 +43,7 @@ Sidekiq.configure_server do |config| config.server_middleware(&Gitlab::SidekiqMiddleware.server_configurator( metrics: Settings.monitoring.sidekiq_exporter, - arguments_logger: SidekiqLogArguments.enabled? && !enable_json_logs, - memory_killer: enable_sidekiq_memory_killer && use_sidekiq_legacy_memory_killer + arguments_logger: SidekiqLogArguments.enabled? && !enable_json_logs )) config.client_middleware(&Gitlab::SidekiqMiddleware.client_configurator) @@ -62,7 +59,7 @@ Sidekiq.configure_server do |config| # To cancel job, it requires `SIDEKIQ_MONITOR_WORKER=1` to enable notification channel Gitlab::SidekiqDaemon::Monitor.instance.start - Gitlab::SidekiqDaemon::MemoryKiller.instance.start if enable_sidekiq_memory_killer && use_sidekiq_daemon_memory_killer + Gitlab::SidekiqDaemon::MemoryKiller.instance.start if enable_sidekiq_memory_killer first_sidekiq_worker = !ENV['SIDEKIQ_WORKER_ID'] || ENV['SIDEKIQ_WORKER_ID'] == '0' health_checks = Settings.monitoring.sidekiq_health_checks |