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. |
||
---|---|---|
.. | ||
accounts | ||
admin/trends | ||
announcements | ||
featured_tags | ||
polls | ||
push | ||
statuses | ||
timelines | ||
trends | ||
announcements_controller_spec.rb | ||
conversations_controller_spec.rb | ||
directories_controller_spec.rb | ||
filters_controller_spec.rb | ||
markers_controller_spec.rb | ||
streaming_controller_spec.rb |