You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/app/lib/activitypub
Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `app/models/form/admin_settings.rb`:
  New setting added upstream. Ported it.
- `app/views/statuses/_simple_status.html.haml`:
  Upstream removed RTL classes. Did the same.
- `config/settings.yml`:
  New setting added upstream. Ported it.
5 years ago
..
activity Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
activity.rb Fix a bear check when the activity object is nil (#14981) 5 years ago
adapter.rb Merge branch 'master' into glitch-soc/merge-upstream 5 years ago
case_transform.rb Add serializing/unserializing of "locked" actor attribute (#4585) 9 years ago
dereferencer.rb Add support for dereferencing objects through bearcaps (#14683) 5 years ago
linked_data_signature.rb Bump rubocop from 0.86.0 to 0.88.0 (#14412) 5 years ago
serializer.rb Fix ActivityPub context not being dynamically computed (#11746) 6 years ago
tag_manager.rb Add follower synchronization mechanism (#14510) 5 years ago