From 3a2d3598fffb6ce5b2ab78d3d3685bf42326cb7a Mon Sep 17 00:00:00 2001 From: Matthew Landauer Date: Fri, 25 Jan 2013 11:17:06 +1100 Subject: Fix path to main configuration file. How did this ever work before? --- lib/configuration.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/configuration.rb') 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 -- cgit v1.2.3