diff options
author | ThibG <thib@sitedethib.com> | 2020-06-17 18:28:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-17 18:28:28 +0200 |
commit | c7da2cc5a1821e589e7241aec21d8bb426722c2a (patch) | |
tree | e61b37ed8d8c5a8446cf656600c90c85ccdc983c /config | |
parent | 0a5cf075cdddbbe40e79ebad8ee2b1abd62d3200 (diff) | |
parent | 9a641a5a0e7a8d45bf6d3b8e4bfdc269def2dc06 (diff) |
Merge pull request #1358 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'config')
-rw-r--r-- | config/deploy.rb | 2 | ||||
-rw-r--r-- | config/initializers/redis.rb | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/config/deploy.rb b/config/deploy.rb index 76e6b2815..5d6873588 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -1,6 +1,6 @@ # frozen_string_literal: true -lock '3.14.0' +lock '3.14.1' set :repo_url, ENV.fetch('REPO', 'https://github.com/tootsuite/mastodon.git') set :branch, ENV.fetch('BRANCH', 'master') diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb index 7573fc9f7..510194044 100644 --- a/config/initializers/redis.rb +++ b/config/initializers/redis.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +Redis.exists_returns_integer = false + redis_connection = Redis.new( url: ENV['REDIS_URL'], driver: :hiredis |