Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name.
RSpec/SpecFilePathFormat
test
api/v1/scheduled_statuses
rubocop:disable
AdminMailer
Sidekiq::Testing.fake!
RSpec/MetadataStyle
enable_coverage_for_eval