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 /core | |
| parent | cc32ad53286c2c03c88cb55713565c2930796024 (diff) | |
| parent | 673c1af5e90a925e00fe6ad7847583a1ddd53ad0 (diff) | |
Merge pull request #58 from elijh/bugfix/security
fix misc security related bugs
Diffstat (limited to 'core')
| -rw-r--r-- | core/config/initializers/load_config.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/core/config/initializers/load_config.rb b/core/config/initializers/load_config.rb deleted file mode 100644 index b2b0318..0000000 --- a/core/config/initializers/load_config.rb +++ /dev/null @@ -1,7 +0,0 @@ -def load_config_file(file) - File.exists?(file) ? YAML.load_file(file)[Rails.env] : {} -end - -defaults = load_config_file("#{Rails.root}/config/defaults.yml") || {} -config = load_config_file("#{Rails.root}/config/config.yml") || {} -APP_CONFIG = defaults.merge(config).with_indifferent_access |