diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-08-30 13:38:41 +0200 |
| commit | 9044a2b051da18e9f70fd4fae55c2bd232891d1f (patch) | |
| tree | 0bf32b0fa0e854f75e50c1dee05ec41f6b301bf4 /app/serializers/rest | |
| parent | 2848c08953a8555e06791170dbf1090575e05d8a (diff) | |
| parent | 49f57b55346f8e62d21a3c8bc63301038ecb796f (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/views/directories/index.html.haml Upstream has redesigned the profile directory, and we had a glitch-soc-specific change to hide follower counts. Ported that change to the new design.
Diffstat (limited to 'app/serializers/rest')
| -rw-r--r-- | app/serializers/rest/account_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index 3ecce8f0a..63b84a0b9 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -5,7 +5,7 @@ class REST::AccountSerializer < ActiveModel::Serializer attributes :id, :username, :acct, :display_name, :locked, :bot, :created_at, :note, :url, :avatar, :avatar_static, :header, :header_static, - :followers_count, :following_count, :statuses_count + :followers_count, :following_count, :statuses_count, :last_status_at has_one :moved_to_account, key: :moved, serializer: REST::AccountSerializer, if: :moved_and_not_nested? has_many :emojis, serializer: REST::CustomEmojiSerializer |