masto-fe/app/lib/activitypub
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
2021-11-26 22:53:55 +01:00
..
activity Merge branch 'main' into glitch-soc/merge-upstream 2021-11-25 23:50:35 +01:00
activity.rb Add trending links (#16917) 2021-11-25 13:07:38 +01:00
adapter.rb Merge branch 'main' into glitch-soc/merge-upstream 2021-11-26 22:53:55 +01: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 Fix addressing of remote groups' followers (#16700) 2021-09-08 23:33:23 +02:00