From: Jenkins <jenkins@jenkins.ninjawedding.org>
Date: Thu, 4 Jan 2018 23:17:11 +0000 (+0000)
Subject: Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c69a23ae4668bad91e3992dbd72e7b3a62427bf9;p=mastodon.git

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
---

c69a23ae4668bad91e3992dbd72e7b3a62427bf9
diff --cc app/serializers/rest/instance_serializer.rb
index abbacc374,ae1dbe6b5..65907dad2
--- a/app/serializers/rest/instance_serializer.rb
+++ b/app/serializers/rest/instance_serializer.rb
@@@ -27,13 -27,9 +27,13 @@@ class REST::InstanceSerializer < Active
    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
 +    StatusLengthValidator::MAX_CHARS
 +  end
 +
    def stats
      {
        user_count: instance_presenter.user_count,