nyastodon/spec/lib/activitypub/activity
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
..
accept_spec.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
add_spec.rb Add support for private pinned posts (#16954) 2022-01-17 00:49:55 +01:00
announce_spec.rb Add support for inlined objects in activity audience (#14514) 2020-08-24 14:11:47 +02:00
block_spec.rb Fix not handling Undo on some activity types when they aren't inlined (#14346) 2020-07-22 11:45:35 +02:00
create_spec.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-03-24 10:53:50 +01:00
delete_spec.rb Fix processing of remote Delete activities (#16084) 2021-04-21 04:46:09 +02:00
flag_spec.rb Set and store report URIs (#10303) 2019-03-17 15:34:56 +01:00
follow_spec.rb Fix URI of repeat follow requests not being recorded (#15662) 2021-02-11 01:53:44 +01:00
like_spec.rb Add ActivityPub inbox (#4216) 2017-08-08 21:52:15 +02:00
move_spec.rb Fix race conditions on account migration creation (#15597) 2021-02-02 14:49:57 +01:00
reject_spec.rb Fix handling of Reject Follow when a matching follow relationship exists (#14479) 2020-08-01 18:20:37 +02:00
remove_spec.rb Fix #6657 - Use target instead of origin in Remove activity (#6664) 2018-03-07 03:54:46 +01:00
undo_spec.rb Fix not handling Undo on some activity types when they aren't inlined (#14346) 2020-07-22 11:45:35 +02:00
update_spec.rb Add joined date to profiles in web UI (#16169) 2021-05-07 14:33:19 +02:00