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.
Mastodon::CLI::Accounts
RSpec/DescribedClass
send
rubocop:disable
Rails/RedundantActiveRecordAllMethod
inLanguage
sleep
RSpec/AnyInstance
account_id
max_id
min_id
RSpec/StubbedMock
RSpec/VerifiedDoubles
RSpec/MessageSpies