Update to rails 3.0.10 and composite_primary_key 3.1.10

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index 7b9168fc9927935f17598f3339741711e047b1bc..f927d056d2a0996f0912c39d7bef55fd8f4a6865 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,23 +1,25 @@
 source 'http://rubygems.org'
 
 source 'http://rubygems.org'
 

-gem 'rails', '3.0.4'
+gem 'rails', '3.0.10'

 
 gem 'pg'
 
 gem 'pg'

+gem 'arel', '>= 2.0.9'

 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 gem 'rmagick', :require => 'RMagick'
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
 gem 'rmagick', :require => 'RMagick'

-gem 'oauth', '>= 0.4.3'
-gem 'oauth-plugin', '> 0.3.14'
+gem 'oauth', '>= 0.4.4'
+gem 'oauth-plugin', '>= 0.4.0.pre4'

 gem 'httpclient'
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 gem 'sanitize'
 gem 'rails-i18n-updater'
 gem 'httpclient'
 gem 'SystemTimer', '>= 1.1.3', :require => 'system_timer'
 gem 'sanitize'
 gem 'rails-i18n-updater'

-gem 'validates_email_format_of', '>= 1.4.2'
+gem 'validates_email_format_of', '>= 1.4.5'
+gem 'open_id_authentication', '>= 1.0.0'

 
 # Should only load if memcache is in use
 
 # Should only load if memcache is in use

-gem 'memcached'
+#gem 'memcached'

 
 # Should only load if we're not in database offline mode
 
 # 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
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators