aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-09-20 23:54:51 +0000
committerkaniini <nenolod@gmail.com>2018-09-20 23:54:51 +0000
commit0fe165165f971e66be8870bfa3fc7dc95049b2d2 (patch)
treeab6272aec993aa574a9be7f1c9bd8213c8183dc4 /lib
parentf2727e23eeb66c8f53d06013c28fef313a5527de (diff)
parent9b0f2d572baae4afd19684f80625fe0791b9d6bc (diff)
downloadpleroma-0fe165165f971e66be8870bfa3fc7dc95049b2d2.tar.gz
Merge branch 'task-204-on-options-request' into 'develop'
Return 204 response on options request See merge request pleroma/pleroma!347
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/router.ex8
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 646e9e5cb..ddfaa8c42 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -400,6 +400,8 @@ defmodule Pleroma.Web.Router do
scope "/", Fallback do
get("/registration/:token", RedirectController, :registration_page)
get("/*path", RedirectController, :redirector)
+
+ options("/*path", RedirectController, :empty)
end
end
@@ -417,4 +419,10 @@ defmodule Fallback.RedirectController do
def registration_page(conn, params) do
redirector(conn, params)
end
+
+ def empty(conn, _params) do
+ conn
+ |> put_status(204)
+ |> text("")
+ end
end