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.
UnnecessaryStringOutput
AdminMailer.new_trends
ENV.fetch
InstanceVariables
#error_explanation
Rubocop
Perfomance/UnfreezeString