Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.
AdminMailer#auto_close_registrations
max_pinned_statuses
local_domain
Capybara/NegationMatcher
Rails/WhereRange
simplecov
rails_helper