From: Claire <claire.github-309c@sitedethib.com>
Date: Wed, 16 Jun 2021 09:24:55 +0000 (+0200)
Subject: Merge branch 'main' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=4aa78027ea747bb932645df31c831d632044e200;p=mastodon.git

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

Conflicts:
- `Gemfile.lock`: upstream-updated dependency (redis) textually too close to
   glitch-specific one (redcarpet).
   Ported upstream change.
---

4aa78027ea747bb932645df31c831d632044e200
diff --cc Gemfile.lock
index 1fc65d31c,a78e2c8fd..a4d258fd5
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@@ -490,8 -485,7 +485,8 @@@ GE
        link_header (~> 0.0, >= 0.0.8)
      rdf-normalize (0.4.0)
        rdf (~> 3.1)
 +    redcarpet (3.5.1)
-     redis (4.2.5)
+     redis (4.3.1)
      redis-namespace (1.8.1)
        redis (>= 3.0.4)
      regexp_parser (2.1.1)
@@@ -769,8 -762,7 +763,8 @@@ DEPENDENCIE
    rails-i18n (~> 6.0)
    rails-settings-cached (~> 0.6)
    rdf-normalize (~> 0.4)
 +  redcarpet (~> 3.5)
-   redis (~> 4.2)
+   redis (~> 4.3)
    redis-namespace (~> 1.8)
    resolv (~> 0.1.0)
    rqrcode (~> 2.0)