From: Thibaut Girka <thib@sitedethib.com>
Date: Wed, 17 Jun 2020 15:10:15 +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=59e92004b3aa8543a42f1bd40d32f936177a434d;p=mastodon.git

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

Conflicts:
- `Gemfile.lock`: not a real conflict, upstream update too close
  to a glitch-soc-specific dependency
---

59e92004b3aa8543a42f1bd40d32f936177a434d
diff --cc Gemfile.lock
index e4900dc68,af770f435..b47ab0091
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -490,8 -490,7 +490,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
 +    redcarpet (3.5.0)
-     redis (4.1.4)
+     redis (4.2.1)
      redis-actionpack (5.2.0)
        actionpack (>= 5, < 7)
        redis-rack (>= 2.1.0, < 3)
@@@ -766,8 -765,7 +766,8 @@@ DEPENDENCIE
    rails-i18n (~> 5.1)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
 +  redcarpet (~> 3.4)
-   redis (~> 4.1)
+   redis (~> 4.2)
    redis-namespace (~> 1.7)
    redis-rails (~> 5.0)
    rqrcode (~> 1.1)