Merge branch 'develop' of https://code.gab.com/gab/social/gab-social into feature/removing_ruby_junk

config/initializers/paperclip.rb

@@ -37,7 +37,7 @@ if ENV['S3_ENABLED'] == 'true'
     s3_options: {
       signature_version: ENV.fetch('S3_SIGNATURE_VERSION') { 'v4' },
       http_open_timeout: 5,
-      http_read_timeout: 5,
+      http_read_timeout: 30,
       http_idle_timeout: 5,
     }
   )

config/initializers/sidekiq.rb

@@ -19,4 +19,4 @@ Sidekiq.configure_client do |config|
   config.redis = redis_params
 end
 
-Sidekiq::Logging.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)
+Sidekiq.logger.level = ::Logger.const_get(ENV.fetch('RAILS_LOG_LEVEL', 'info').upcase.to_s)