Switch to rails 2.0.2 as Debian/Ubuntu is able to handle it now.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index be3cf2a8f3c4fff81dcb348fad9c138b6bc8e6aa..cfabe365f4ce7aafea69bb93e563a54ab7396540 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,8 +5,7 @@
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-# DO NOT BUMP THIS TO 2.0.2 AS THE LIVE SERVERS CAN'T RUN THAT
-RAILS_GEM_VERSION = '2.0.1' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.0.2' unless defined? RAILS_GEM_VERSION
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
@@ -68,3 +67,8 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   # config.active_record.default_timezone = :utc
 end
+
+# This has to be after the above block for some reason (doesnt pull in /lib/osm.rb?)
+POTLATCH_PRESETS = Potlatch::Potlatch.get_presets()
+
+