diff options
author | ThibG <thib@sitedethib.com> | 2018-10-05 19:01:44 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-05 19:01:44 +0200 |
commit | 515ce8f4697fe7edfdf14c45575a71164b920db9 (patch) | |
tree | 1211e136ba3e886ee8daaa5200babffc42375dd1 /app/serializers | |
parent | a9e8f98a9d32c57956d41009bd09a1f33310676e (diff) | |
parent | 00fcdebed758f031b486ec239fd425fc54a180b3 (diff) |
Merge pull request #762 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
-rw-r--r-- | app/serializers/rest/account_serializer.rb | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/app/serializers/rest/account_serializer.rb b/app/serializers/rest/account_serializer.rb index d84b48afb..12adc971c 100644 --- a/app/serializers/rest/account_serializer.rb +++ b/app/serializers/rest/account_serializer.rb @@ -11,11 +11,7 @@ class REST::AccountSerializer < ActiveModel::Serializer has_many :emojis, serializer: REST::CustomEmojiSerializer class FieldSerializer < ActiveModel::Serializer - attributes :name, :value - - attribute :verified_at, if: :verifiable? - - delegate :verifiable?, to: :object + attributes :name, :value, :verified_at def value Formatter.instance.format_field(object.account, object.value) |