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

diff --cc app/javascript/styles/mastodon/components.scss
Simple merge

diff --cc app/serializers/rest/status_serializer.rb
index a7b797368e1e5a0a7c382e3634fa96e47af02a1a,c9b76cb162041494a4dcd8972bbea2d3638c0008..906f489dbf49d0dea189d5acce84994dab77d9b3
--- 1/app/serializers/rest/status_serializer.rb
--- 2/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