diff options
| author | jessib <jessib@riseup.net> | 2013-07-15 10:33:13 -0700 |
|---|---|---|
| committer | jessib <jessib@riseup.net> | 2013-07-15 10:33:13 -0700 |
| commit | bf5922d26e27ee9695b07eade42d36a34b63fc4e (patch) | |
| tree | 1bba41b4d5b4ba59966012f9171c01817a332bc0 /config/application.rb | |
| parent | cc32ad53286c2c03c88cb55713565c2930796024 (diff) | |
| parent | 673c1af5e90a925e00fe6ad7847583a1ddd53ad0 (diff) | |
Merge pull request #58 from elijh/bugfix/security
fix misc security related bugs
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..ec25da5 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 + module LeapWeb class Application < Rails::Application # Settings in config/environments/* take precedence over those specified here. |