diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-11-26 23:41:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-26 23:41:01 +0100 |
| commit | 4aec8087c71a623abdf201bbc2619507a6b02374 (patch) | |
| tree | 931f4c972e55ec032f3f5f6b58621d0380a92a5e /app/lib/activitypub | |
| parent | 97151840b02499a0cec1360907a6b86a1df02b3b (diff) | |
| parent | ca5d78816bb31454de28480dec5c6384ed259eef (diff) | |
Merge pull request #1640 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/lib/activitypub')
| -rw-r--r-- | app/lib/activitypub/adapter.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb index ef00a4e2e..d8b0c63b2 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -19,7 +19,6 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base atom_uri: { 'ostatus' => 'http://ostatus.org#', 'atomUri' => 'ostatus:atomUri' }, conversation: { 'ostatus' => 'http://ostatus.org#', 'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri', 'conversation' => 'ostatus:conversation' }, focal_point: { 'toot' => 'http://joinmastodon.org/ns#', 'focalPoint' => { '@container' => '@list', '@id' => 'toot:focalPoint' } }, - identity_proof: { 'toot' => 'http://joinmastodon.org/ns#', 'IdentityProof' => 'toot:IdentityProof' }, blurhash: { 'toot' => 'http://joinmastodon.org/ns#', 'blurhash' => 'toot:blurhash' }, discoverable: { 'toot' => 'http://joinmastodon.org/ns#', 'discoverable' => 'toot:discoverable' }, voters_count: { 'toot' => 'http://joinmastodon.org/ns#', 'votersCount' => 'toot:votersCount' }, |