diff options
| author | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
| commit | d6907e6e0c50e8c965d07dd902ead94ff2d20f12 (patch) | |
| tree | a49bb13a96a0b6f200d35f8df66a37ed8c6ca3f0 /config | |
| parent | d031b185e2c9f143b134b1813a799910adf10bad (diff) | |
| parent | 14900164b8e56d8dc5506016e5a0b55632306e34 (diff) | |
| download | pleroma-d6907e6e0c50e8c965d07dd902ead94ff2d20f12.tar.gz pleroma-d6907e6e0c50e8c965d07dd902ead94ff2d20f12.zip | |
Merge branch 'chore/elixir-1.11' into 'develop'
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
Diffstat (limited to 'config')
| -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 2c6142360..124f30a77 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" |