Merge branch 'fix/fallback-config' into 'develop'

Fallback to Config if Mix.Config does not exist, even if Config does not exist either See merge request pleroma/pleroma!1320
2019-06-21 23:43:14 +00:00 · 2019-06-21 23:43:14 +00:00 · cf94b813e5
parent 55742d978d f4009b6706
commit cf94b813e5
1 changed files with 1 additions and 1 deletions
--- a/priv/templates/sample_config.eex
+++ b/priv/templates/sample_config.eex
@ -3,7 +3,7 @@
 # NOTE: This file should not be committed to a repo or otherwise made public
 # without removing sensitive information.

-<%= if Code.ensure_loaded?(Config) do
+<%= if Code.ensure_loaded?(Config) or not Code.ensure_loaded?(Mix.Config) do
  "import Config"
 else
  "use Mix.Config"