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

Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.

spec/controllers/settings/aliases_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::AliasesController do
+RSpec.describe Settings::AliasesController do
   render_views
 
   let!(:user) { Fabricate(:user) }

spec/controllers/settings/applications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::ApplicationsController do
+RSpec.describe Settings::ApplicationsController do
   render_views
 
   let!(:user) { Fabricate(:user) }

spec/controllers/settings/deletes_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::DeletesController do
+RSpec.describe Settings::DeletesController do
   render_views
 
   describe 'GET #show' do

spec/controllers/settings/exports_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::ExportsController do
+RSpec.describe Settings::ExportsController do
   render_views
 
   describe 'GET #show' do

spec/controllers/settings/featured_tags_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::FeaturedTagsController do
+RSpec.describe Settings::FeaturedTagsController do
   render_views
 
   shared_examples 'authenticate user' do

spec/controllers/settings/login_activities_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::LoginActivitiesController do
+RSpec.describe Settings::LoginActivitiesController do
   render_views
 
   let!(:user) { Fabricate(:user) }

spec/controllers/settings/migration/redirects_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Migration::RedirectsController do
+RSpec.describe Settings::Migration::RedirectsController do
   render_views
 
   let!(:user) { Fabricate(:user, password: 'testtest') }

spec/controllers/settings/migrations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::MigrationsController do
+RSpec.describe Settings::MigrationsController do
   render_views
 
   shared_examples 'authenticate user' do

spec/controllers/settings/pictures_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::PicturesController do
+RSpec.describe Settings::PicturesController do
   render_views
 
   let!(:user) { Fabricate(:user) }

spec/controllers/settings/preferences/appearance_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::AppearanceController do
+RSpec.describe Settings::Preferences::AppearanceController do
   render_views
 
   let!(:user) { Fabricate(:user) }

spec/controllers/settings/preferences/base_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::BaseController do
+RSpec.describe Settings::Preferences::BaseController do
   describe 'after_update_redirect_path' do
     it 'raises error when called' do
       expect { described_class.new.send(:after_update_redirect_path) }.to raise_error(/Override/)

spec/controllers/settings/preferences/notifications_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::NotificationsController do
+RSpec.describe Settings::Preferences::NotificationsController do
   render_views
 
   let(:user) { Fabricate(:user) }

spec/controllers/settings/preferences/other_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::Preferences::OtherController do
+RSpec.describe Settings::Preferences::OtherController do
   render_views
 
   let(:user) { Fabricate(:user, chosen_languages: []) }

spec/controllers/settings/sessions_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::SessionsController do
+RSpec.describe Settings::SessionsController do
   render_views
 
   let(:user) { Fabricate(:user) }

spec/controllers/settings/two_factor_authentication/confirmations_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthentication::ConfirmationsController do
+RSpec.describe Settings::TwoFactorAuthentication::ConfirmationsController do
   render_views
 
   shared_examples 'renders :new' do

spec/controllers/settings/two_factor_authentication/otp_authentication_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
+RSpec.describe Settings::TwoFactorAuthentication::OtpAuthenticationController do
   render_views
 
   let(:user) { Fabricate(:user) }

spec/controllers/settings/two_factor_authentication/recovery_codes_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthentication::RecoveryCodesController do
+RSpec.describe Settings::TwoFactorAuthentication::RecoveryCodesController do
   render_views
 
   describe 'POST #create' do

spec/controllers/settings/two_factor_authentication/webauthn_credentials_controller_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 require 'webauthn/fake_client'
 
-describe Settings::TwoFactorAuthentication::WebauthnCredentialsController do
+RSpec.describe Settings::TwoFactorAuthentication::WebauthnCredentialsController do
   render_views
 
   let(:user) { Fabricate(:user) }

spec/controllers/settings/two_factor_authentication_methods_controller_spec.rb

@@ -2,7 +2,7 @@
 
 require 'rails_helper'
 
-describe Settings::TwoFactorAuthenticationMethodsController do
+RSpec.describe Settings::TwoFactorAuthenticationMethodsController do
   render_views
 
   context 'when not signed in' do