diff options
| author | ThibG <thib@sitedethib.com> | 2019-03-08 01:47:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-03-08 01:47:36 +0100 |
| commit | 29a09858f6700c0a6eb17797836589ed0839dec9 (patch) | |
| tree | 96ac7fbac23d6ca32704c143342b5606523c8cab /app/serializers/activitypub | |
| parent | 38e9c66f34d7054357a3de63834f182734d43d75 (diff) | |
| parent | ca45198ccbbdde88731f074fcab2b5c9310775c2 (diff) | |
Merge pull request #945 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers/activitypub')
| -rw-r--r-- | app/serializers/activitypub/note_serializer.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/serializers/activitypub/note_serializer.rb b/app/serializers/activitypub/note_serializer.rb index 3a9e388a5..553f333d8 100644 --- a/app/serializers/activitypub/note_serializer.rb +++ b/app/serializers/activitypub/note_serializer.rb @@ -122,11 +122,7 @@ class ActivityPub::NoteSerializer < ActiveModel::Serializer end def poll_options - if !object.poll.expired? && object.poll.hide_totals? - object.poll.unloaded_options - else - object.poll.loaded_options - end + object.poll.loaded_options end def poll_and_multiple? |