Conflicts: - `app/models/form/admin_settings.rb`: Upstream changed code style change, including on a line modified by glitch-soc. Kept glitch-soc's line but with the code style change applied.
Sidekiq::Testing.fake!
models/form/custom_emoji_batch
.times
AccountStatusesCleanupPolicy
models/announcement
Naming/VariableNumber
RSpec/MessageSpies
RSpec/MetadataStyle
default_scope
Admin::ActionLog
RSpec/MessageChain
RSpec/AnyInstance
StatusPin
PIN_LIMIT
Lint/EmptyBlock
Lint/UselessAssignment
normalizes
Webhook#events