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

This commit is contained in:
Claire
2022-07-03 21:36:15 +02:00
7 changed files with 740 additions and 846 deletions

View File

@@ -219,7 +219,7 @@ GEM
et-orbi (1.2.7)
tzinfo
excon (0.76.0)
fabrication (2.28.0)
fabrication (2.29.0)
faker (2.21.0)
i18n (>= 1.8.11, < 2)
faraday (1.9.3)
@@ -449,7 +449,7 @@ GEM
parslet (2.0.0)
pastel (0.8.0)
tty-color (~> 0.5)
pg (1.4.0)
pg (1.4.1)
pghero (2.8.3)
activerecord (>= 5)
pkg-config (1.4.7)
@@ -610,7 +610,7 @@ GEM
redis (>= 4.2.0)
sidekiq-bulk (0.2.0)
sidekiq
sidekiq-scheduler (4.0.1)
sidekiq-scheduler (4.0.2)
redis (>= 4.2.0)
rufus-scheduler (~> 3.2)
sidekiq (>= 4)
@@ -761,7 +761,7 @@ DEPENDENCIES
doorkeeper (~> 5.5)
dotenv-rails (~> 2.7)
ed25519 (~> 1.3)
fabrication (~> 2.28)
fabrication (~> 2.29)
faker (~> 2.21)
fast_blank (~> 1.0)
fastimage