Conflicts: - `app/validators/status_pin_validator.rb`: Upstream refactored that file, while glitch-soc had configurable limits for pinned statuses. Updated the code with upstream's refactor, while keeping glitch-soc's configurability.
RSpec/MultipleExpectations
api/v1/accounts/relationships
api/v1/admin/*
/api/v1/emails/confirmations
/instances/*
.times
/api/v1/accounts
API::
/api/v1/blocks
Api::
api/v1/custom_emojis
api/v1/endorsements
RSpec/MetadataStyle
/api/v1/polls
api/v1/preferences
Api::V1::ProfilesController
api/v1/scheduled_statuses
/api/v1/suggestions