Claire 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		2021-02-12 10:28:32 +01:00
..
accept_spec.rb
add_spec.rb
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 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02:00
delete_spec.rb
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
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
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	Fix ActivityPub context not being dynamically computed (#11746)	2019-09-03 22:52:32 +02:00