projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 1:
f2727e2
)
Merge branch 'task-204-on-options-request' into 'develop'
author
kaniini
<nenolod@gmail.com>
Thu, 20 Sep 2018 23:54:51 +0000
(23:54 +0000)
committer
kaniini
<nenolod@gmail.com>
Thu, 20 Sep 2018 23:54:51 +0000
(23:54 +0000)
Return 204 response on options request
See merge request pleroma/pleroma!347
lib/pleroma/web/router.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/router.ex
b/lib/pleroma/web/router.ex
index 646e9e5cb8cf15b18ce47ee0e17439f0aba534d7..ddfaa8c423f19bb42b9ed5d5909c8a651df272c8 100644
(file)
--- 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