summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-04-16 18:40:56 +0000
committerkaniini <nenolod@gmail.com>2019-04-16 18:40:56 +0000
commit02a53d00c93969ff99a460f69e92be5af2628691 (patch)
tree756aa6d47ad551f5f5c8cbb0744c0517230948dd /config
parentcde7711b12d64081f16e88a3f3ac93c811471d61 (diff)
parent2472efb4e9aafe68d1ab3eef12ea3c3ad3859029 (diff)
downloadpleroma-02a53d00c93969ff99a460f69e92be5af2628691.tar.gz
pleroma-02a53d00c93969ff99a460f69e92be5af2628691.zip
Merge branch 'fix/remote-follow-auth' into 'develop'
Fix: remote follows should not ask user to log-in again for authorization See merge request pleroma/pleroma!1060
Diffstat (limited to 'config')
-rw-r--r--config/config.exs5
1 files changed, 4 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs
index eb74e7483..750e593e3 100644
--- a/config/config.exs
+++ b/config/config.exs
@@ -154,7 +154,10 @@ config :pleroma, Pleroma.Web.Endpoint,
signing_salt: "CqaoopA2",
render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)],
pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2],
- secure_cookie_flag: true
+ secure_cookie_flag: true,
+ extra_cookie_attrs: [
+ "SameSite=Lax"
+ ]
# Configures Elixir's Logger
config :logger, :console,