diff options
| author | jessib <jessib@riseup.net> | 2013-08-01 10:52:04 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-08-01 10:52:04 -0700 |
| commit | 368dbc55966b2b74699065e07de28fe321f286b6 (patch) | |
| tree | 7c03bf78596e9e2a7735518ba713eaacd864a975 /config/application.rb | |
| parent | 3578c13abd86d15ca6310bf5652f4855a8daa1a8 (diff) | |
| parent | 1a3fdad01d9cb2e2596281d38ce0c0f1ad4da04a (diff) | |
Merge branch 'master' into billing_with_tests
Conflicts:
app/views/home/index.html.haml
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/application.rb b/config/application.rb index ec25da5..354127b 100644 --- a/config/application.rb +++ b/config/application.rb @@ -17,7 +17,11 @@ end APP_CONFIG = ["defaults.yml", "config.yml"].inject({}) {|config, file| filepath = File.expand_path(file, File.dirname(__FILE__)) - config.merge(File.exists?(filepath) ? YAML.load_file(filepath)[Rails.env] : {}) + if File.exists?(filepath) && settings = YAML.load_file(filepath)[Rails.env] + config.merge(settings) + else + config + end }.with_indifferent_access module LeapWeb |