X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/ddd5b4cf19a92582fd114914be5bd5a04d3522a7..cbb59310d3fb610aedd0f76beb6dc374bd3cb7e0:/config/environment.rb diff --git a/config/environment.rb b/config/environment.rb index 436d5961d..02d99f20c 100644 --- 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'