From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 25 Apr 2020 13:19:32 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=8b2823b7b6e5120ef8830db49e1e19927867ce14;p=mastodon.git

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

8b2823b7b6e5120ef8830db49e1e19927867ce14
diff --cc Gemfile.lock
index b70dd2502,a9a1d1c24..13f6bed59
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -490,11 -490,10 +490,11 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
 +    redcarpet (3.5.0)
      redis (4.1.3)
-     redis-actionpack (5.0.2)
-       actionpack (>= 4.0, < 6)
-       redis-rack (>= 1, < 3)
+     redis-actionpack (5.2.0)
+       actionpack (>= 5, < 7)
+       redis-rack (>= 2.1.0, < 3)
        redis-store (>= 1.1.0, < 2)
      redis-activesupport (5.0.4)
        activesupport (>= 3, < 6)