Merge remote-tracking branch 'tootsuite/master'

2017-11-19 01:30:29 -06:00
parent bcda3f85ce 08deec4c84
commit d083f7741a
38 changed files with 852 additions and 42 deletions
--- a/app/lib/activitypub/adapter.rb
+++ b/app/lib/activitypub/adapter.rb
@ -9,6 +9,7 @@ class ActivityPub::Adapter < ActiveModelSerializers::Adapter::Base
      {
        'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
        'sensitive'                 => 'as:sensitive',
+        'movedTo'                   => 'as:movedTo',
        'Hashtag'                   => 'as:Hashtag',
        'ostatus'                   => 'http://ostatus.org#',
        'atomUri'                   => 'ostatus:atomUri',