Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Conflict because of a code style fix, while some changed lines are absent from glitch-soc. Ignored the deleted lines.
RSpec/SpecFilePathFormat
test
models/form/custom_emoji_batch
Capybara/ClickLinkOrButtonStyle
CLI::Emoji
AdminMailer
/share
RSpec/MetadataStyle
RSpec/LetSetup
enable_coverage_for_eval