move potlatch presets to only be generated once, and allow pulling in way_tags in...

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 493e1664e05d8ab33681463a4fd486b660f026aa..bf80499f7502e8a07d0355f2dbfe0b1b5b43962f 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,8 @@
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-#RAILS_GEM_VERSION = '2.0.1' unless defined? RAILS_GEM_VERSION
+# 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
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
@@ -67,3 +68,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 = OSM::Potlatch.get_presets()
+
+