diff options
author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-04 23:17:11 +0000 |
---|---|---|
committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-04 23:17:11 +0000 |
commit | c69a23ae4668bad91e3992dbd72e7b3a62427bf9 (patch) | |
tree | fc8e594f6f9ecc1dd5cb13c491aa17c372adb587 /app/serializers/rest | |
parent | fc884d015a1a2d6c31976af3d63039390fa15939 (diff) | |
parent | d872902997c29e228001b71a4a3ede589e346f5d (diff) |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'app/serializers/rest')
-rw-r--r-- | app/serializers/rest/instance_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/instance_serializer.rb b/app/serializers/rest/instance_serializer.rb index abbacc374..65907dad2 100644 --- a/app/serializers/rest/instance_serializer.rb +++ b/app/serializers/rest/instance_serializer.rb @@ -27,7 +27,7 @@ class REST::InstanceSerializer < ActiveModel::Serializer end def thumbnail - full_asset_url(instance_presenter.thumbnail.file.url) if instance_presenter.thumbnail + instance_presenter.thumbnail ? full_asset_url(instance_presenter.thumbnail.file.url) : full_pack_url('preview.jpg') end def max_toot_chars |