diff options
| author | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
|---|---|---|
| committer | Henare Degan <henare.degan@gmail.com> | 2013-03-03 14:52:30 +1100 |
| commit | cbdff06aa95a7987b54c712dc6729e138f608eca (patch) | |
| tree | b101dd575c5cab97675c0ac488e68fa6cbd0c4fd /config/application.rb | |
| parent | f02881b5bf5cc4d633983100078be2e64b8e6fcc (diff) | |
Rename Configuration class to avoid conflict with ActiveSupport::Configurable
Diffstat (limited to 'config/application.rb')
| -rw-r--r-- | config/application.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/config/application.rb b/config/application.rb index 0e02e9e03..f5b525a36 100644 --- a/config/application.rb +++ b/config/application.rb @@ -53,7 +53,7 @@ module Alaveteli # Note that having set a zone, the Active Record # time_zone_aware_attributes flag is on, so times from models # will be in this time zone - config.time_zone = ::Configuration::time_zone + config.time_zone = ::AlaveteliConfiguration::time_zone config.after_initialize do require 'routing_filters.rb' @@ -62,8 +62,8 @@ module Alaveteli config.autoload_paths << "#{Rails.root.to_s}/lib/mail_handler" # See Rails::Configuration for more options - ENV['RECAPTCHA_PUBLIC_KEY'] = ::Configuration::recaptcha_public_key - ENV['RECAPTCHA_PRIVATE_KEY'] = ::Configuration::recaptcha_private_key + ENV['RECAPTCHA_PUBLIC_KEY'] = ::AlaveteliConfiguration::recaptcha_public_key + ENV['RECAPTCHA_PRIVATE_KEY'] = ::AlaveteliConfiguration::recaptcha_private_key # Insert a bit of middleware code to prevent uneeded cookie setting. require "#{Rails.root}/lib/whatdotheyknow/strip_empty_sessions" |