From: kaniini <nenolod@gmail.com>
Date: Thu, 20 Sep 2018 23:54:51 +0000 (+0000)
Subject: Merge branch 'task-204-on-options-request' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=0fe165165f971e66be8870bfa3fc7dc95049b2d2;hp=f2727e23eeb66c8f53d06013c28fef313a5527de;p=akkoma

Merge branch 'task-204-on-options-request' into 'develop'

Return 204 response on options request

See merge request pleroma/pleroma!347
---

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