diff options
| author | feld <feld@feld.me> | 2020-10-27 17:42:24 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-27 17:42:24 +0000 |
| commit | e062329a177e1a1382cb3a44ef71e6d278b4963e (patch) | |
| tree | 1d98291af1a0d0c64794bc2b4e13ee7e62c634bc /config/config.exs | |
| parent | d16336e7fbf7851ee5f50a17747067f2be741581 (diff) | |
| parent | 2f7401806bbe5427bbcaa7cdce35130320ae3bb4 (diff) | |
| download | pleroma-e062329a177e1a1382cb3a44ef71e6d278b4963e.tar.gz pleroma-e062329a177e1a1382cb3a44ef71e6d278b4963e.zip | |
Merge branch 'develop' into 'feature/autofollowing'
# Conflicts:
# CHANGELOG.md
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index 0f3785d12..14fecd9a9 100644 --- a/config/config.exs +++ b/config/config.exs @@ -123,7 +123,6 @@ websocket_config = [ # Configures the endpoint config :pleroma, Pleroma.Web.Endpoint, - instrumenters: [Pleroma.Web.Endpoint.Instrumenter], url: [host: "localhost"], http: [ ip: {127, 0, 0, 1}, @@ -143,7 +142,7 @@ config :pleroma, Pleroma.Web.Endpoint, secret_key_base: "aK4Abxf29xU9TTDKre9coZPUgevcVCFQJe/5xP/7Lt4BEif6idBIbjupVbOrbKxl", signing_salt: "CqaoopA2", render_errors: [view: Pleroma.Web.ErrorView, accepts: ~w(json)], - pubsub: [name: Pleroma.PubSub, adapter: Phoenix.PubSub.PG2], + pubsub_server: Pleroma.PubSub, secure_cookie_flag: true, extra_cookie_attrs: [ "SameSite=Lax" |