Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' into glitch-soc/merge-upstream

Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.

config/routes/settings.rb

@@ -63,6 +63,7 @@ namespace :settings do
   resource :delete, only: [:show, :destroy]
   resource :migration, only: [:show, :create]
   resource :verification, only: :show
+  resource :privacy, only: [:show, :update], controller: 'privacy'
 
   namespace :migration do
     resource :redirect, only: [:new, :create, :destroy]