From: Tom Hughes <tom@compton.nu>
Date: Wed, 2 Dec 2009 09:10:38 +0000 (+0000)
Subject: Require oauth 0.3.6 and remove Matt's comment saying we need to
X-Git-Tag: live~6441
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/74e0acf0f533d50da51a59c8ee34b72e9c03c258?ds=sidebyside

Require oauth 0.3.6 and remove Matt's comment saying we need to
require it when it's available.
---

diff --git a/config/environment.rb b/config/environment.rb
index 1cfc902a9..da2f9b8ac 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -49,9 +49,7 @@ 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'
+  config.gem 'oauth', :version => '>= 0.3.6'
   config.gem 'httpclient'
 
   # Only load the plugins named here, in the order given. By default, all plugins