Merge commit '9e245d147bcb2c72cc552ff8c276a1c34e2f686d' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
This commit is contained in:
Claire
2023-06-18 13:41:33 +02:00
214 changed files with 3232 additions and 3494 deletions

View File

@ -62,6 +62,7 @@ namespace :settings do
resource :delete, only: [:show, :destroy]
resource :migration, only: [:show, :create]
resource :verification, only: :show
namespace :migration do
resource :redirect, only: [:new, :create, :destroy]