summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2021-12-27 00:47:20 +0100
committerGitHub <noreply@github.com>2021-12-27 00:47:20 +0100
commitfe71548844715d796b9a6d2dd5234f70cf080f13 (patch)
tree754d3e3fda806b3ec042e3a5bc5fe4d1dda08995 /config
parente65080181af82c14d3441a0890f2ba0a6fb9cd7e (diff)
Fix warnings on Rails boot (#16946)
Diffstat (limited to 'config')
-rw-r--r--config/environments/development.rb2
-rw-r--r--config/initializers/sidekiq.rb2
2 files changed, 3 insertions, 1 deletions
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d76361c6027..de8762ff744 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -81,7 +81,7 @@ Rails.application.configure do
Bullet.bullet_logger = true
Bullet.rails_logger = false
- Bullet.add_whitelist type: :n_plus_one_query, class_name: 'User', association: :account
+ Bullet.add_safelist type: :n_plus_one_query, class_name: 'User', association: :account
end
config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 219554df446..19a705ce89f 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,5 +1,7 @@
# frozen_string_literal: true
+require_relative '../../lib/sidekiq_error_handler'
+
Sidekiq.configure_server do |config|
config.redis = REDIS_SIDEKIQ_PARAMS