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.
Settings::
RSpec/AnyInstance
Sidekiq::Testing.fake!
settings/privacy
settings/verifications