Merge branch 'master' into openstreetbugs

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 55c2df4ae4185ed2d28e3ef3e0faaf35659000bc..e339aca4d4afac53cc1e0c1083e62392b6772296 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -44,6 +44,7 @@ Rails::Initializer.run do |config|
   # To use Rails without a database, you must remove the Active Record framework
   if OSM_STATUS == :database_offline
     config.frameworks -= [ :active_record ]
+    config.eager_load_paths = []
   end
 
   # Specify gems that this application depends on.
@@ -88,7 +89,7 @@ Rails::Initializer.run do |config|
   # Use the database for sessions instead of the cookie-based default,
   # which shouldn't be used to store highly confidential information
   # (create the session table with 'rake db:sessions:create')
-  unless  OSM_STATUS == :database_offline
+  unless OSM_STATUS == :database_offline or OSM_STATUS == :database_readonly
     config.action_controller.session_store = :sql_session_store
   end
 
@@ -102,4 +103,5 @@ Rails::Initializer.run do |config|
 
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
+
 end