diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-18 18:03:27 +0100 |
| commit | 291012ec0c08f5323b2102eb4d2dc8714ddce4d9 (patch) | |
| tree | 09e7a5fef106da1b6ebdc53ac0df62cafc159520 /app/serializers/activitypub/flag_serializer.rb | |
| parent | 6e3a4bcbc70bb33bfb0746cf3b2186ee9f4e6515 (diff) | |
| parent | f85b66eb8cc9513822d0ece3928b12aa789bb410 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/accounts_controller.rb - app/controllers/follower_accounts_controller.rb - app/controllers/statuses_controller.rb All conflicts caused by the additional `use_pack` used for glitch-soc's theming system.
Diffstat (limited to 'app/serializers/activitypub/flag_serializer.rb')
| -rw-r--r-- | app/serializers/activitypub/flag_serializer.rb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/app/serializers/activitypub/flag_serializer.rb b/app/serializers/activitypub/flag_serializer.rb index 53e8f726d..1e7a46dd9 100644 --- a/app/serializers/activitypub/flag_serializer.rb +++ b/app/serializers/activitypub/flag_serializer.rb @@ -5,7 +5,6 @@ class ActivityPub::FlagSerializer < ActiveModel::Serializer attribute :virtual_object, key: :object def id - # This is nil for now ActivityPub::TagManager.instance.uri_for(object) end |