about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-28 15:12:33 +0100
committerGitHub <noreply@github.com>2019-03-28 15:12:33 +0100
commitbb316faffff7a76bc89f7e942233f0e14caf60f5 (patch)
tree260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /app/services
parent0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff)
parent050efbc12650feaac3e833c4dd740bf090e3dae1 (diff)
Merge pull request #970 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services')
-rw-r--r--app/services/post_status_service.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 820c553c9..333bf88d8 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -162,7 +162,7 @@ class PostStatusService < BaseService
       text: @text,
       media_attachments: @media || [],
       thread: @in_reply_to,
-      owned_poll_attributes: poll_attributes,
+      poll_attributes: poll_attributes,
       sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
       spoiler_text: @options[:spoiler_text] || '',
       visibility: @visibility,