diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-18 20:21:17 -0500 |
commit | ab04be2f84132e6b6a83ca86cbabf2cdf13f5894 (patch) | |
tree | 589ed30bd629a305a28eeb5a458fa0f83945eca3 /app/lib/ostatus/activity | |
parent | 6a6f680d98d114e3bb26e414ad7e3787a62bd129 (diff) | |
parent | f02411da404f730e3c05dc7dca1ac0f2d631315e (diff) |
Merge remote-tracking branch 'origin/master' into gs-master
Conflicts: config/i18n-tasks.yml
Diffstat (limited to 'app/lib/ostatus/activity')
-rw-r--r-- | app/lib/ostatus/activity/creation.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/lib/ostatus/activity/creation.rb b/app/lib/ostatus/activity/creation.rb index aa46267dc..6235127b2 100644 --- a/app/lib/ostatus/activity/creation.rb +++ b/app/lib/ostatus/activity/creation.rb @@ -45,7 +45,7 @@ class OStatus::Activity::Creation < OStatus::Activity::Base visibility: visibility_scope, conversation: find_or_create_conversation, thread: thread? ? find_status(thread.first) || find_activitypub_status(thread.first, thread.second) : nil, - media_attachments: media_attachments + media_attachment_ids: media_attachments.map(&:id) ) save_mentions(status) |