Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did.
AdminMailer#auto_close_registrations
public_visibility
max_pinned_statuses
Status::MEDIA_ATTACHMENTS_LIMIT
Rails/WhereRange
simplecov
rails_helper