mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-16 16:15:01 +01:00
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.rb | ||
featured_tags_controller.rb | ||
follower_accounts_controller.rb | ||
following_accounts_controller.rb | ||
identity_proofs_controller.rb | ||
lists_controller.rb | ||
lookup_controller.rb | ||
notes_controller.rb | ||
pins_controller.rb | ||
relationships_controller.rb | ||
search_controller.rb | ||
statuses_controller.rb |