Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline

2017-04-16 17:08:17 +03:00 · 2017-04-16 17:08:17 +03:00 · 5229b01944
commit 5229b01944
parent 63f04b314d e158e32124
22 changed files with 143 additions and 47 deletions
--- a/lib/pleroma/web/activity_pub/activity_pub.ex
+++ b/lib/pleroma/web/activity_pub/activity_pub.ex
@ -174,7 +174,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
    Repo.all(query)
  end

-  def upload(%Plug.Upload{} = file) do
+  def upload(file) do
    data = Upload.store(file)
    Repo.insert(%Object{data: data})
  end