aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/uploader_controller.ex
diff options
context:
space:
mode:
authorRoman Chvanikov <chvanikoff@pm.me>2019-07-20 01:03:25 +0300
committerRoman Chvanikov <chvanikoff@pm.me>2019-07-20 01:03:25 +0300
commit36049f08efadb5f6f727753ecc1f7be6a5b4e3d8 (patch)
tree2f1e1b5a20ad654cda4021115e621887d2735959 /lib/pleroma/web/uploader_controller.ex
parente7c175c943e9e3f53df76d812c09cfeffdb1c56b (diff)
parent33729bbb2834bfa1f223b11d47dc8e3230d47657 (diff)
downloadpleroma-36049f08efadb5f6f727753ecc1f7be6a5b4e3d8.tar.gz
Merge develop
Diffstat (limited to 'lib/pleroma/web/uploader_controller.ex')
-rw-r--r--lib/pleroma/web/uploader_controller.ex4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/pleroma/web/uploader_controller.ex b/lib/pleroma/web/uploader_controller.ex
index bf09775e6..0cc172698 100644
--- a/lib/pleroma/web/uploader_controller.ex
+++ b/lib/pleroma/web/uploader_controller.ex
@@ -11,10 +11,6 @@ defmodule Pleroma.Web.UploaderController do
process_callback(conn, :global.whereis_name({Uploader, upload_path}), params)
end
- def callbacks(conn, _) do
- render_error(conn, :bad_request, "bad request")
- end
-
defp process_callback(conn, pid, params) when is_pid(pid) do
send(pid, {Uploader, self(), conn, params})