Merge branch 'master' of github.com:AF83/stif-boiv

2 files changed, 3 insertions, 9 deletions

diff --git a/Gemfile b/Gemfile
index 2a0da4c48..c378820b3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -139,7 +139,6 @@ gem 'rake'
 gem 'devise-async'
 gem 'apartment', '~> 1.0.0'
 gem 'aasm'
-gem 'activerecord-nulldb-adapter'
 gem 'puma', '~> 3.10.0'
 
 gem 'newrelic_rpm'
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index c2d5f9d6d..724aaecc5 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -7,14 +7,9 @@ Sidekiq.configure_server do |config|
       pendings.map { |sync| sync.failed({error: 'Failed by Sidekiq reboot', processing_time: 0}) }
     end
   end
+  config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://localhost:6379/12') }
 end
 
-unless Rails.env.test? || Rails.env.development?
-  Sidekiq.configure_server do |config|
-    config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') }
-  end
-
-  Sidekiq.configure_client do |config|
-    config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://redis:6379/12') }
-  end
+Sidekiq.configure_client do |config|
+  config.redis = { url: ENV.fetch('SIDEKIQ_REDIS_URL', 'redis://localhost:6379/12') }
 end