Fixed precondition typo and segment_controller foreign key

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 781d332d9c9afc546104144d05c5d28064ba76d8..a26cb54420075233e0347d621960320ecc5a6c98 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -5,7 +5,7 @@
 # ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '1.1.4'
+RAILS_GEM_VERSION = '1.1.6'
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')
@@ -52,6 +52,8 @@ 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 = {
   :address  => "localhost",