Update site to use rails 2.3.5.

[rails.git] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index e35353c3cd6b851ebecad7515d8000fd6a0f1f27..1cfc902a97e704116cbb59423473cff5c966cebe 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
 ENV['RAILS_ENV'] ||= 'production'
 
 # Specifies gem version of Rails to use when vendor/rails is not present

-RAILS_GEM_VERSION = '2.3.2' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION

 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'
 
 # Set the server URL
 SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org'


@@ -52,6 +52,7 @@ Rails::Initializer.run do |config|
   # note: this should be changed to 0.3.6 as soon as it's released, as this has fixes for
   # uploading multipart documents.
   config.gem 'oauth', :version => '>=0.2.1'
   # note: this should be changed to 0.3.6 as soon as it's released, as this has fixes for
   # uploading multipart documents.
   config.gem 'oauth', :version => '>=0.2.1'

+  config.gem 'httpclient'

 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.
 
   # Only load the plugins named here, in the order given. By default, all plugins 
   # in vendor/plugins are loaded in alphabetical order.