From: Thibaut Girka <thib@sitedethib.com>
Date: Sat, 11 May 2019 16:23:46 +0000 (+0200)
Subject: Merge branch 'master' into glitch-soc/merge-upstream
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=2b97d9d780fd3326a470693164f71464c106d4ca;p=mastodon.git

Merge branch 'master' into glitch-soc/merge-upstream
---

2b97d9d780fd3326a470693164f71464c106d4ca
diff --cc app/serializers/rest/status_serializer.rb
index a7b797368,c9b76cb16..906f489db
--- a/app/serializers/rest/status_serializer.rb
+++ b/app/serializers/rest/status_serializer.rb
@@@ -9,10 -9,11 +9,13 @@@ class REST::StatusSerializer < ActiveMo
    attribute :favourited, if: :current_user?
    attribute :reblogged, if: :current_user?
    attribute :muted, if: :current_user?
 +  attribute :bookmarked, if: :current_user?
    attribute :pinned, if: :pinnable?
 +  attribute :local_only if :local?
  
+   attribute :content, unless: :source_requested?
+   attribute :text, if: :source_requested?
+ 
    belongs_to :reblog, serializer: REST::StatusSerializer
    belongs_to :application, if: :show_application?
    belongs_to :account, serializer: REST::AccountSerializer