diff options
| author | elijah <elijah@riseup.net> | 2013-07-11 17:01:02 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2013-07-11 17:01:02 -0700 |
| commit | b6b336d9f96c0618885b587ebb2b4d85a9381afb (patch) | |
| tree | 71da656eb4ed51715e1f13639befdf62f0009d87 /config/application.rb | |
| parent | 1f77c345783bf197be183b2e5025f875c0eac882 (diff) | |
config - add force_ssl to config, add configuration notes to README.md
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 5e52c7b..c78a814 100644 --- a/config/application.rb +++ b/config/application.rb @@ -15,6 +15,11 @@ if defined?(Bundler) # Bundler.require(:default, :assets, Rails.env) 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] : {}) +}.with_indifferent_access.freeze + module LeapWeb class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. |