X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/4d06426c2aca03c1a5a7db48166d3f74023e0404..cdf12b7a33334fefe58ed140c2874217591ac69e:/config/environment.rb diff --git a/config/environment.rb b/config/environment.rb index be3cf2a8f..cfabe365f 100644 --- 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() + +