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

Conflicts:
- `app/helpers/settings_helper.rb`:
  Upstream added a new helper.
  Conflict caused by the fact there is a glitch-soc specific helper.
  Added upstream's new helper in addition to glitch-soc's.

app/validators/email_address_validator.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-# NOTE: I initially wrote this as `EmailValidator` but it ended up clashing
-# with an indirect dependency of ours, `validate_email`, which, turns out,
-# has the same approach as we do, but with an extra check disallowing
-# single-label domains. Decided to not switch to `validate_email` because
-# we do want to allow at least `localhost`.
-
 class EmailAddressValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
     value = value.strip