2d4b4b0b45
Conflicts: - `app/controllers/accounts_controller.rb`: Upstream introduced support for private pinned toots, but glitch-soc's query was a bit different as it filtered out local-only toots. Used upstream's query, while adding local-only filtering back. - `app/controllers/activitypub/collections_controller.rb`: Same thing with regards to local-only posts. - `app/validators/status_pin_validator.rb`: Not a real conflict, but the line below was different in glitch-soc due to the configurable pinned toots limit. |
||
|---|---|---|
| .. | ||
| credentials_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| notes_controller_spec.rb | ||
| pins_controller_spec.rb | ||
| relationships_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||