diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-01 21:51:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-01 21:51:16 +0200 |
| commit | 665eb1affe7ba765af476e6f00096aad3af70735 (patch) | |
| tree | 20fbd695cfc9bad551abead27a80fdb0e19567b9 /config/initializers | |
| parent | 39a0622de70dc24275808cee9526658bd68a55ed (diff) | |
| parent | f60c78ff3e42e321b457a7d63868b49bf56adfda (diff) | |
Merge pull request #1369 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/paperclip.rb | 1 | ||||
| -rw-r--r-- | config/initializers/redis.rb | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/config/initializers/paperclip.rb b/config/initializers/paperclip.rb index ebb009065..b4849370d 100644 --- a/config/initializers/paperclip.rb +++ b/config/initializers/paperclip.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true Paperclip::DataUriAdapter.register +Paperclip::ResponseWithLimitAdapter.register Paperclip.interpolates :filename do |attachment, style| if style == :original diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb index 510194044..7573fc9f7 100644 --- a/config/initializers/redis.rb +++ b/config/initializers/redis.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -Redis.exists_returns_integer = false - redis_connection = Redis.new( url: ENV['REDIS_URL'], driver: :hiredis |