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

Conflicts: - app/models/media_attachment.rb
2019-05-04 16:37:26 +02:00
parent 2c2f649200 c88d9e524b
commit 33c80e0783
67 changed files with 896 additions and 288 deletions
--- a/app/serializers/rest/media_attachment_serializer.rb
+++ b/app/serializers/rest/media_attachment_serializer.rb
@ -5,7 +5,7 @@ class REST::MediaAttachmentSerializer < ActiveModel::Serializer

  attributes :id, :type, :url, :preview_url,
             :remote_url, :text_url, :meta,
-             :description
+             :description, :blurhash

  def id
    object.id.to_s