From cbdff06aa95a7987b54c712dc6729e138f608eca Mon Sep 17 00:00:00 2001
From: Henare Degan <henare.degan@gmail.com>
Date: Sun, 3 Mar 2013 14:52:30 +1100
Subject: Rename Configuration class to avoid conflict with
 ActiveSupport::Configurable

---
 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 d239b95f0..6d2bed66d 100644
--- a/lib/configuration.rb
+++ b/lib/configuration.rb
@@ -12,7 +12,7 @@ MySociety::Config.load_default
 
 # TODO: Make this return different values depending on the current rails environment
 
-module Configuration
+module AlaveteliConfiguration
   DEFAULTS = {
     :ADMIN_BASE_URL => '',
     :ADMIN_PASSWORD => '',
@@ -68,7 +68,7 @@ module Configuration
     :WORKING_OR_CALENDAR_DAYS => 'working',
   }
 
-  def Configuration.method_missing(name)
+  def AlaveteliConfiguration.method_missing(name)
     key = name.to_s.upcase
     if DEFAULTS.has_key?(key.to_sym)
       MySociety::Config.get(key, DEFAULTS[key.to_sym])
-- 
cgit v1.2.3