diff options
| author | lambda <pleromagit@rogerbraun.net> | 2018-06-12 08:26:26 +0000 |
|---|---|---|
| committer | lambda <pleromagit@rogerbraun.net> | 2018-06-12 08:26:26 +0000 |
| commit | 3f42806b1b8f0a2c27dda4821ab61c92b9a4652f (patch) | |
| tree | c8c3be8650849fe1a47d4c6a138dcfdf3a5b24c3 /lib/pleroma/web | |
| parent | 564c73ab2496bee24ba46f69fc48662296041db6 (diff) | |
| parent | f34232da86ff051d7b1e5a9e6d8ff32ff54dbfcb (diff) | |
| download | pleroma-3f42806b1b8f0a2c27dda4821ab61c92b9a4652f.tar.gz | |
Merge branch 'develop' into 'develop'
Dedupe uploads
See merge request pleroma/pleroma!115
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/activity_pub/activity_pub.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/activity_pub/activity_pub.ex b/lib/pleroma/web/activity_pub/activity_pub.ex index e2d7cbb6e..08e21069c 100644 --- a/lib/pleroma/web/activity_pub/activity_pub.ex +++ b/lib/pleroma/web/activity_pub/activity_pub.ex @@ -496,7 +496,7 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do end def upload(file) do - data = Upload.store(file) + data = Upload.store(file, Application.get_env(:pleroma, :instance)[:dedupe_media]) Repo.insert(%Object{data: data}) end |