diff options
author | kaniini <nenolod@gmail.com> | 2019-05-16 20:11:12 +0000 |
---|---|---|
committer | kaniini <nenolod@gmail.com> | 2019-05-16 20:11:12 +0000 |
commit | bf84d50c76cb8d9a6a9ea77a7620c9545b10a7ed (patch) | |
tree | d2f318ac678c2dbb65bf49f622d0979778c71648 /config/test.exs | |
parent | a328251a525bf09a26d3d52c34f48f1e97d34f1b (diff) | |
parent | 4711d8151c8cb7ce2024f378e17b3a113a3aac1c (diff) | |
download | pleroma-bf84d50c76cb8d9a6a9ea77a7620c9545b10a7ed.tar.gz pleroma-bf84d50c76cb8d9a6a9ea77a7620c9545b10a7ed.zip |
Merge branch 'feature/890-add-report-uri' into 'develop'
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
Diffstat (limited to 'config/test.exs')
-rw-r--r-- | config/test.exs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index a0c90c371..40db66170 100644 --- a/config/test.exs +++ b/config/test.exs @@ -61,6 +61,8 @@ config :pleroma, Pleroma.ScheduledActivity, config :pleroma, :app_account_creation, max_requests: 5 +config :pleroma, :http_security, report_uri: "https://endpoint.com" + try do import_config "test.secret.exs" rescue |