fedi/mastodon
1
0
Fork 1
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-28 03:03:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
mastodon/spec/controllers/api/v1/accounts
History
Claire 2d4b4b0b45 Merge branch 'main' into glitch-soc/merge-upstream 
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.
2022-01-17 08:28:52 +01:00
..
credentials_controller_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
follower_accounts_controller_spec.rb Fix own following/followers not showing muted users (#13614) 2020-05-08 20:36:34 +02:00
following_accounts_controller_spec.rb Fix own following/followers not showing muted users (#13614) 2020-05-08 20:36:34 +02:00
lists_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
notes_controller_spec.rb Fix AccountNote not having a maximum length (#16942) 2021-11-06 00:12:25 +01:00
pins_controller_spec.rb Add specs for Accounts::PinsController (#9542) 2018-12-17 06:03:51 +01:00
relationships_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
search_controller_spec.rb Add more granular OAuth scopes (#7929) 2018-07-05 18:31:35 +02:00
statuses_controller_spec.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00