X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f4571eeb7cb4f920bb5d642c9e1c37c9495fc6ba..639a994c9b851b94d4c65aa96af732eefc8453fb:/config/environment.rb diff --git a/config/environment.rb b/config/environment.rb index c7fa3c483..12a8b5424 100644 --- 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 = '2.3.2' unless defined? RAILS_GEM_VERSION +RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION # Set the server URL SERVER_URL = ENV['OSM_SERVER_URL'] || 'www.openstreetmap.org' @@ -49,6 +49,9 @@ Rails::Initializer.run do |config| config.gem 'composite_primary_keys', :version => '2.2.2' config.gem 'libxml-ruby', :version => '>= 1.1.1', :lib => 'libxml' config.gem 'rmagick', :lib => 'RMagick' + # 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' # Only load the plugins named here, in the order given. By default, all plugins # in vendor/plugins are loaded in alphabetical order.