diff options
| author | feld <feld@feld.me> | 2020-10-22 20:33:52 +0000 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2020-11-04 17:05:21 +0300 |
| commit | 6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5 (patch) | |
| tree | ed1d6e555e7b06dd93e0c24d6db69df4ef8c8cf6 /config | |
| parent | 49b43e668eb208a95a621f667f72f41b69bc10e5 (diff) | |
| download | pleroma-6c8469664a08d2cd02bd8e6d998d8e2d5f07dac5.tar.gz | |
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 148e9e7da..170e4e1c7 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}, @@ -145,7 +144,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" |