aboutsummaryrefslogtreecommitdiffstats
path: root/lib/configuration.rb
diff options
context:
space:
mode:
authorHenare Degan <henare.degan@gmail.com>2013-03-03 14:52:30 +1100
committerHenare Degan <henare.degan@gmail.com>2013-03-03 14:52:30 +1100
commitcbdff06aa95a7987b54c712dc6729e138f608eca (patch)
treeb101dd575c5cab97675c0ac488e68fa6cbd0c4fd /lib/configuration.rb
parentf02881b5bf5cc4d633983100078be2e64b8e6fcc (diff)
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
Diffstat (limited to 'lib/configuration.rb')
-rw-r--r--lib/configuration.rb4
1 files changed, 2 insertions, 2 deletions
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])