summaryrefslogtreecommitdiff
path: root/config/test.exs
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-12-17 19:30:05 +0000
committerlambda <pleromagit@rogerbraun.net>2018-12-17 19:30:05 +0000
commit078b8b6d228bee28697fda4bbefe65736f8b0d3c (patch)
tree5ab5ffc319a32beaa954af9f6f216642651c444d /config/test.exs
parent567359790ea623949585629c41580961c59a01ff (diff)
parentba9ef77b6ae7fd6ade9eb87a418f9c87c7d94647 (diff)
downloadpleroma-078b8b6d228bee28697fda4bbefe65736f8b0d3c.tar.gz
pleroma-078b8b6d228bee28697fda4bbefe65736f8b0d3c.zip
Merge branch 'phoenix14' into 'develop'
Upgrade to Phoenix 1.4 Closes #451 See merge request pleroma/pleroma!560
Diffstat (limited to 'config/test.exs')
-rw-r--r--config/test.exs3
1 files changed, 2 insertions, 1 deletions
diff --git a/config/test.exs b/config/test.exs
index 5c6acfead..8f4a2dc17 100644
--- a/config/test.exs
+++ b/config/test.exs
@@ -4,7 +4,8 @@ use Mix.Config
# you can enable the server option below.
config :pleroma, Pleroma.Web.Endpoint,
http: [port: 4001],
- server: false
+ url: [port: 4001],
+ server: true
# Print only warnings and errors during test
config :logger, level: :warn