summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2013-04-03 11:22:16 +0200
committerAzul <azul@leap.se>2013-04-03 11:22:16 +0200
commit654ab25fa4659119d5ddaa9ae116fce69a386ab1 (patch)
tree0f0adf5a0c92a20a7084c251dafac7a420f9b640 /config
parentf4172ac9ea7a484659fa2019119533bc9569880f (diff)
make sure user tests also run when run from users subdir
* The APP_CONFIG needs to be initialized in core so that is required from other engines * paths for load_views need to be relative to the model - not to rails root.
Diffstat (limited to 'config')
-rw-r--r--config/initializers/load_config.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb
deleted file mode 100644
index b2b0318..0000000
--- a/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