diff options
| author | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
|---|---|---|
| committer | Maxim Filippov <colixer@gmail.com> | 2019-07-18 23:38:38 +0300 |
| commit | 9570a5be405c4cf4f07907eab4ced21e07fa20c9 (patch) | |
| tree | 9575741206d0604e74ab2d8f719c3da0a3002b1d /lib/pleroma/web/uploader_controller.ex | |
| parent | 418ae6638d64c915ce4dae742dd493f43c8025d8 (diff) | |
| parent | 16cfee708ec8e9c6cbbeb15432127c7757c5c173 (diff) | |
| download | pleroma-9570a5be405c4cf4f07907eab4ced21e07fa20c9.tar.gz | |
Merge branch 'develop' into feature/admin-api-user-statuses
Diffstat (limited to 'lib/pleroma/web/uploader_controller.ex')
| -rw-r--r-- | lib/pleroma/web/uploader_controller.ex | 4 |
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}) |