Load diaspora.yml overrides for test env

2ae8b2f6 · Jonne Haß · Dennis Schubert · e30293b9 · 2ae8b2f6
Commit 2ae8b2f6 authored Jul 23, 2015 by Jonne Haß Committed by Dennis Schubert Jul 24, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

config/load_config.rb config/load_config.rb +1 -1

No files found.
--- a/config/load_config.rb
+++ b/config/load_config.rb
@@ -26,7 +26,7 @@ AppConfig ||= Configurate::Settings.create do

  add_provider Configurate::Provider::YAML,
               File.join(config_dir, "diaspora.yml"),
-               namespace: rails_env, required: false unless rails_env == "test"
+               namespace: rails_env, required: false
  add_provider Configurate::Provider::YAML,
               File.join(config_dir, "diaspora.yml"),
               namespace: "configuration", required: false