X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/604011d6a88571730f2fbb0c4b718f5edccafc30..cf34e5577ba889988b28776bb008430fafcaf3f7:/Gemfile

diff --git a/Gemfile b/Gemfile
index 88f2ff11a..f927d056d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,24 +1,25 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.4'
+gem 'rails', '3.0.10'
 
 gem 'pg'
-gem 'arel', '>= 2.0.8'
+gem 'arel', '>= 2.0.9'
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 gem 'rmagick', :require => 'RMagick'
 gem 'oauth', '>= 0.4.4'
-gem 'oauth-plugin', '> 0.3.14'
+gem 'oauth-plugin', '>= 0.4.0.pre4'
 gem 'httpclient'
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 gem 'sanitize'
 gem 'rails-i18n-updater'
 gem 'validates_email_format_of', '>= 1.4.5'
+gem 'open_id_authentication', '>= 1.0.0'
 
 # Should only load if memcache is in use
-gem 'memcached'
+#gem 'memcached'
 
 # Should only load if we're not in database offline mode
-gem 'composite_primary_keys', '>= 3.1.1'
+gem 'composite_primary_keys', '= 3.1.10'
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators