Update to rails 3.0.10 and composite_primary_key 3.1.10

[rails.git] / Gemfile

diff --git a/Gemfile b/Gemfile
index d36805b604269d2bbe82119bc23ac58463049747..f927d056d2a0996f0912c39d7bef55fd8f4a6865 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.9'
+gem 'rails', '3.0.10'
 
 gem 'pg'
 gem 'arel', '>= 2.0.9'
@@ -13,12 +13,13 @@ 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.6'
+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