aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2018-11-03 15:36:23 +0000
committerkaniini <nenolod@gmail.com>2018-11-03 15:36:23 +0000
commit007f1c73b1d42012763b51d2cbdd049783eb1844 (patch)
treeff358de1dc6ff0e2fa3a696827ed072a555862ac /lib
parent50f974b83b598a573307d144ce1614fae4c99969 (diff)
parente954cfcc2c9e9b36bf31dc0bdbc90b1f8a2d47ce (diff)
downloadpleroma-007f1c73b1d42012763b51d2cbdd049783eb1844.tar.gz
Merge branch 'feature/cors-again' into 'develop'
Add CORSPlug to make web-based OAuth easier. See merge request pleroma/pleroma!420
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/endpoint.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/endpoint.ex b/lib/pleroma/web/endpoint.ex
index 955bd61f3..6673ab576 100644
--- a/lib/pleroma/web/endpoint.ex
+++ b/lib/pleroma/web/endpoint.ex
@@ -56,6 +56,7 @@ defmodule Pleroma.Web.Endpoint do
extra: "SameSite=Strict"
)
+ plug(CORSPlug)
plug(Pleroma.Web.Router)
@doc """