diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
| commit | 9044a2b051da18e9f70fd4fae55c2bd232891d1f (patch) | |
| tree | 0bf32b0fa0e854f75e50c1dee05ec41f6b301bf4 /app/lib | |
| parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
| parent | 49f57b55346f8e62d21a3c8bc63301038ecb796f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.
Diffstat (limited to 'app/lib')
| -rw-r--r-- | app/lib/activitypub/adapter.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/lib/activitypub/adapter.rb b/app/lib/activitypub/adapter.rb index a1d84de2f..1c58be8c0 100644 --- a/app/lib/activitypub/adapter.rb +++ b/app/lib/activitypub/adapter.rb @@ -20,6 +20,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base 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' }, }.freeze def self.default_key_transform |