From: Thibaut Girka <thib@sitedethib.com>
Date: Mon, 27 Jan 2020 14:46:50 +0000 (+0100)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=c56a504d116d62fe669d15a270133d7c78dd61f1;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/serializers/rest/account_serializer.rb`:
  Upstream added code too close to glitch-soc-specific followers-hiding code.
  Ported upstream changes.
---

c56a504d116d62fe669d15a270133d7c78dd61f1
diff --cc app/serializers/rest/account_serializer.rb
index 657dd36f3,0db1916b0..4e497cdbd
--- a/app/serializers/rest/account_serializer.rb
+++ b/app/serializers/rest/account_serializer.rb
@@@ -56,7 -56,7 +56,11 @@@ class REST::AccountSerializer < ActiveM
      object.moved? && object.moved_to_account.moved_to_account_id.nil?
    end
  
+   def last_status_at
+     object.last_status_at&.to_date&.iso8601
+   end
++
 +  def followers_count
 +    (Setting.hide_followers_count || object.user&.setting_hide_followers_count) ? -1 : object.followers_count
 +  end
  end