Update to rails 4.1.1

[rails.git] / config / environments / production.rb

diff --git a/config/environments/production.rb b/config/environments/production.rb
index bbb1c55ef1d7a984b853a033906b3c4fa8a7775e..9debf96668cc4de0d9a74ba86e03096a2e24d911 100644 (file)
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -5,7 +5,7 @@ OpenStreetMap::Application.configure do
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and
   config.cache_classes = true
 
   # Eager load code on boot. This eager loads most of Rails and

-  # your application in memory, allowing both thread web servers
+  # your application in memory, allowing both threaded web servers

   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true
   # and those relying on copy on write to perform better.
   # Rake tasks automatically ignore this option for performance.
   config.eager_load = true


@@ -69,12 +69,13 @@ OpenStreetMap::Application.configure do
 
   # Precompile additional assets.
   # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 
   # Precompile additional assets.
   # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.

-  config.assets.precompile += %w( index.js browse.js changeset.js welcome.js )
-  config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
+  config.assets.precompile += %w( index.js browse.js welcome.js fixthemap.js )
+  config.assets.precompile += %w( user.js diary_entry.js swfobject.js )

   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
   config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
   config.assets.precompile += %w( embed.js embed.css )
   config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
   config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
   config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
   config.assets.precompile += %w( embed.js embed.css )

+  config.assets.precompile += %w( html5shiv.js )

   config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
   config.assets.precompile += %w( potlatch2.swf )
   config.assets.precompile += %w( potlatch2/assets.zip )
   config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
   config.assets.precompile += %w( potlatch2.swf )
   config.assets.precompile += %w( potlatch2/assets.zip )


@@ -101,4 +102,7 @@ OpenStreetMap::Application.configure do
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new
 
   # Use default logging formatter so that PID and timestamp are not suppressed.
   config.log_formatter = ::Logger::Formatter.new

+
+  # Do not dump schema after migrations.
+  config.active_record.dump_schema_after_migration = false

 end
 end