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 /core | |
| parent | 1f77c345783bf197be183b2e5025f875c0eac882 (diff) | |
config - add force_ssl to config, add configuration notes to README.md
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 |