Merge branch 'master' into glitch-soc/merge-upstream

Conflicts: - app/models/media_attachment.rb Upstream raised max image size from 8MB to 10MB while our limit is configurable. Raised the default to 10MB.
2019-10-03 11:10:12 +02:00
parent 857c67f31b bae268b2f6
commit a84aedb7a7
168 changed files with 3456 additions and 997 deletions
--- a/config/initializers/chewy.rb
+++ b/config/initializers/chewy.rb
@ -12,8 +12,9 @@ Chewy.settings = {
  sidekiq: { queue: 'pull' },
 }

-Chewy.root_strategy    = enabled ? :sidekiq : :bypass
-Chewy.request_strategy = enabled ? :sidekiq : :bypass
+Chewy.root_strategy              = :custom_sidekiq
+Chewy.request_strategy           = :custom_sidekiq
+Chewy.use_after_commit_callbacks = false

 module Chewy
  class << self