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

diff --cc Gemfile.lock
Simple merge

diff --cc app/controllers/accounts_controller.rb
Simple merge

diff --cc app/controllers/application_controller.rb
Simple merge

diff --cc app/controllers/statuses_controller.rb
Simple merge

diff --cc app/models/user.rb
Simple merge

diff --cc app/serializers/rest/instance_serializer.rb
index abbacc37476a74f6b36c6303b5fc065dff6b0335,ae1dbe6b592d3a666ea142a39a8dad1e86366d16..65907dad2f1b6a2679b501cfe0f7a1522512c22b
--- 1/app/serializers/rest/instance_serializer.rb
--- 2/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,

diff --cc app/services/batched_remove_status_service.rb
Simple merge

diff --cc config/locales/pl.yml
Simple merge