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/AnyInstance
.times
RSpec/InstanceVariable
Cache-Control
Vary
RSpec/DescribedClass
controllers/accounts
RSpec/IndexedLet
RSpec/MultipleExpectations
controllers/statuses