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

Conflicts:
- `.env.production.sample`:
  Upstream added new configuration options, uncommented by default.
  Commented them.
- `Gemfile.lock`:
  Upstream updated dependencies textually close to glitch-soc-specific
  dependencies.
  Updated those upstream dependencies.
This commit is contained in:
Claire
2021-10-25 20:28:51 +02:00
258 changed files with 12765 additions and 4746 deletions

View File

@ -463,6 +463,7 @@ Rails.application.routes.draw do
member do
post :follow
post :unfollow
post :remove_from_followers
post :block
post :unblock
post :mute