Thibaut Girka e5f934ddf0 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Conflict caused because we have additional code to make sure pinned local-only toots don't get rendered on the ActivityPub endpoints. Ported upstream changes.		2020-09-07 09:21:38 +02:00
..
activity	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-30 16:13:08 +02:00
activity.rb	Add support for dereferencing objects through bearcaps (#14683)	2020-08-30 12:34:20 +02:00
adapter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-09-07 09:21:38 +02:00
case_transform.rb	Add serializing/unserializing of "locked" actor attribute (#4585)	2017-08-12 17:41:03 +02:00
dereferencer.rb	Add support for dereferencing objects through bearcaps (#14683)	2020-08-30 12:34:20 +02:00
linked_data_signature.rb	Bump rubocop from 0.86.0 to 0.88.0 (#14412)	2020-09-01 03:04:00 +02:00
serializer.rb	Fix ActivityPub context not being dynamically computed (#11746)	2019-09-03 22:52:32 +02:00
tag_manager.rb	Improve group processing (#14279)	2020-07-14 19:05:34 +02:00