Reset locale after tests which change it finish

[rails.git] / config / application.rb

diff --git a/config/application.rb b/config/application.rb
index 12d777c2484bac99eb18ad25e948497ee350f384..bee36fa2ae72db8711ec202ab2ffe0a5085cf825 100644 (file)
--- a/config/application.rb
+++ b/config/application.rb
@@ -1,6 +1,6 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)
 
-require File.expand_path('../preinitializer', __FILE__)
+require File.expand_path("../preinitializer", __FILE__)
 
 if STATUS == :database_offline
   require "action_controller/railtie"
@@ -9,7 +9,7 @@ if STATUS == :database_offline
   require "sprockets/railtie"
   require "rails/test_unit/railtie"
 else
-  require 'rails/all'
+  require "rails/all"
 end
 
 # Require the gems listed in Gemfile, including any gems
@@ -43,5 +43,10 @@ module OpenStreetMap
 
     # Don't eager load models when the database is offline
     config.paths["app/models"].skip_eager_load! if STATUS == :database_offline
+
+    # Use memcached for caching if required
+    if defined?(MEMCACHE_SERVERS)
+      config.cache_store = :mem_cache_store, MEMCACHE_SERVERS, { :namespace => "rails:cache" }
+    end
   end
 end