API 0.4 Reverted minor errors in changeset 2324

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index a26cb54420075233e0347d621960320ecc5a6c98..b55fbe44104e4b2896613e69b6d91a8d99168ee7 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,10 +5,13 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '1.1.6'
+RAILS_GEM_VERSION = '1.2.3'

 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

+\r
+# Application constants needed for routes.rb - must go before Initializer call\r
+API_VERSION = ENV['OSM_API_VERSION'] || '0.4'\r

 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
 
 Rails::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here


@@ -51,8 +54,6 @@ end
 # end
 
 # Include your application configuration below
 # end
 
 # Include your application configuration below

-
-API_VERSION = ENV['OSM_API_VERSION'] || '0.4'

 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 ActionMailer::Base.server_settings = {
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 ActionMailer::Base.server_settings = {