diff options
author | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
---|---|---|
committer | rinpatch <rinpatch@sdf.org> | 2019-05-18 13:37:38 +0300 |
commit | 5ece901af3e887664653c79c5e61618cc5cf0ecf (patch) | |
tree | 93fc7c3bdb70348d5ef91fa9f7db3293b17f9854 /config/test.exs | |
parent | fd920c897339b9cedea042dd6698d14380cedae7 (diff) | |
parent | 8e9a764dfcde315afd055c8e63543bfca24cc41b (diff) | |
download | pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.tar.gz pleroma-5ece901af3e887664653c79c5e61618cc5cf0ecf.zip |
Resolve merge conflicts and remove IO.inspects
Diffstat (limited to 'config/test.exs')
-rw-r--r-- | config/test.exs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/config/test.exs b/config/test.exs index f93bc5994..6100989c4 100644 --- a/config/test.exs +++ b/config/test.exs @@ -59,6 +59,16 @@ config :pleroma, Pleroma.ScheduledActivity, total_user_limit: 3, enabled: false +config :pleroma, :app_account_creation, max_requests: 5 + +config :pleroma, :http_security, report_uri: "https://endpoint.com" + +config :pleroma, :http, send_user_agent: false + +rum_enabled = System.get_env("RUM_ENABLED") == "true" +config :pleroma, :database, rum_enabled: rum_enabled +IO.puts("RUM enabled: #{rum_enabled}") + try do import_config "test.secret.exs" rescue |