Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value.
NotificationRequest
AdminMailer#auto_close_registrations
max_pinned_statuses
MediaAttachment
simplecov
rails_helper