From: Tom Hughes <tom@compton.nu>
Date: Tue, 18 Aug 2009 20:02:52 +0000 (+0000)
Subject: Merge oauth branch at r17138 to trunk.
X-Git-Tag: live~6767
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/2c13981b0fa6d7b6ddfc4277c53eb9c515dd2736?hp=d227589a6336999c38bffc5e11655100b9a4630a

Merge oauth branch at r17138 to trunk.
---

diff --git a/config/environment.rb b/config/environment.rb
index c7fa3c483..e35353c3c 100644
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -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.