Revert accidental commit.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 436d5961dc46549422d980a336df9139d3141445..02d99f20c6095cca73e5138c70fb7a77e5aab37d 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,6 +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
 
 # Set the server URL
@@ -68,5 +69,7 @@ Rails::Initializer.run do |config|
   # 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()
+
 
-require 'composite_primary_keys'