diff options
| author | ThibG <thib@sitedethib.com> | 2020-07-07 16:21:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-07 16:21:42 +0200 |
| commit | c4e1b82caf5c932a3c19bc77726c9e3ab3d2c46a (patch) | |
| tree | 432bd5bc0c7ec19aac3175150e397b5336c71a4d /app/serializers | |
| parent | 94e09d309cb068ea92919767e40e655260ac43cb (diff) | |
| parent | 6c7ac1b48f7d4c6d0a1e0cf7f663c3188421d7c7 (diff) | |
Merge pull request #1373 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/serializers')
| -rw-r--r-- | app/serializers/rest/relationship_serializer.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/serializers/rest/relationship_serializer.rb b/app/serializers/rest/relationship_serializer.rb index e295fb847..c2f3c9a11 100644 --- a/app/serializers/rest/relationship_serializer.rb +++ b/app/serializers/rest/relationship_serializer.rb @@ -52,6 +52,6 @@ class REST::RelationshipSerializer < ActiveModel::Serializer end def note - (instance_options[:relationships].account_note[object.id] || {})[:comment] + (instance_options[:relationships].account_note[object.id] || {})[:comment] || '' end end |