diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 13:34:51 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2018-08-24 15:10:34 +0200 |
| commit | 246c313d457397f412f9fb5eed3ee02cf5d9a561 (patch) | |
| tree | 4c8d12cc031476870a918bec3b3000f899101a32 /app/serializers/activitypub/actor_serializer.rb | |
| parent | 0ddf439999b05b5dfd6d5a5257327fa7d3565e65 (diff) | |
| parent | a2cabf3f4af9271d8bfdb13c1ae2b7a8b4e6fb88 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/controllers/application_controller.rb Changed instance theme selection by instance flavour selection.
Diffstat (limited to 'app/serializers/activitypub/actor_serializer.rb')
| -rw-r--r-- | app/serializers/activitypub/actor_serializer.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/serializers/activitypub/actor_serializer.rb b/app/serializers/activitypub/actor_serializer.rb index 41c9aa44e..5054bd683 100644 --- a/app/serializers/activitypub/actor_serializer.rb +++ b/app/serializers/activitypub/actor_serializer.rb @@ -93,11 +93,11 @@ class ActivityPub::ActorSerializer < ActiveModel::Serializer end def avatar_exists? - object.avatar.exists? + object.avatar? end def header_exists? - object.header.exists? + object.header? end def manually_approves_followers |