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

Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream enforced new code style rules, where we had different code.
  Applied the new code style rules.

spec/controllers/api/v1/streaming_controller_spec.rb

@@ -3,14 +3,14 @@
 require 'rails_helper'
 
 describe Api::V1::StreamingController do
-  around(:each) do |example|
+  around do |example|
     before = Rails.configuration.x.streaming_api_base_url
     Rails.configuration.x.streaming_api_base_url = Rails.configuration.x.web_domain
     example.run
     Rails.configuration.x.streaming_api_base_url = before
   end
 
-  before(:each) do
+  before do
     request.headers.merge! Host: Rails.configuration.x.web_domain
   end
 
@@ -24,7 +24,7 @@ describe Api::V1::StreamingController do
   end
 
   context 'with streaming api on different host' do
-    before(:each) do
+    before do
       Rails.configuration.x.streaming_api_base_url = "wss://streaming-#{Rails.configuration.x.web_domain}"
       @streaming_host = URI.parse(Rails.configuration.x.streaming_api_base_url).host
     end

spec/controllers/api/v2/search_controller_spec.rb

@@ -53,7 +53,7 @@ RSpec.describe Api::V2::SearchController do
 
   context 'without token' do
     describe 'GET #index' do
-      let(:search_params) {}
+      let(:search_params) { nil }
 
       before do
         get :index, params: search_params