diff options
| author | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 11:17:06 +1100 |
|---|---|---|
| committer | Matthew Landauer <matthew@openaustralia.org> | 2013-01-25 11:17:06 +1100 |
| commit | 3a2d3598fffb6ce5b2ab78d3d3685bf42326cb7a (patch) | |
| tree | 01d3646ea7f6032504e0144498bc5ecb360a2fb5 /lib/configuration.rb | |
| parent | 026a3a8bc26b461dcce4e8aaf69b67e61ec20a6a (diff) | |
Fix path to main configuration file. How did this ever work before?
Diffstat (limited to 'lib/configuration.rb')
| -rw-r--r-- | lib/configuration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/configuration.rb b/lib/configuration.rb index 9c369b2e7..d239b95f0 100644 --- a/lib/configuration.rb +++ b/lib/configuration.rb @@ -2,9 +2,9 @@ require File.dirname(__FILE__) + '/../commonlib/rblib/config' # Load intial mySociety config if ENV["RAILS_ENV"] == "test" - MySociety::Config.set_file(File.join(File.dirname(__FILE__), 'test'), true) + MySociety::Config.set_file(File.join(File.dirname(__FILE__), '..', 'config', 'test'), true) else - MySociety::Config.set_file(File.join(File.dirname(__FILE__), 'general'), true) + MySociety::Config.set_file(File.join(File.dirname(__FILE__), '..', 'config', 'general'), true) end MySociety::Config.load_default |