Require composite_primary_keys 5.0.0.rc1

diff --git a/Gemfile b/Gemfile
index e2e822ba486faa6a9dbd4e44156bfee219682fae..0e101dc39c1900d4bbc43c6f7520f1c286ad731a 100644 (file)
--- a/Gemfile
+++ b/Gemfile
@@ -17,7 +17,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'oauth-plugin', '>= 0.4.0.pre7'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '>= 4.1.2'
+gem 'composite_primary_keys', '>= 5.0.0.rc1'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.1.2'

diff --git a/Gemfile.lock b/Gemfile.lock
index 2291fc0d90a6e741e265cc0b1b92c076496cf920..98ab8b98e1c870611808e36eb346a48dabc4a5b0 100644 (file)
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,8 +40,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    composite_primary_keys (4.1.2)
-      activerecord (~> 3.1)
+    composite_primary_keys (5.0.0.rc1)
+      activerecord (~> 3.2.0.rc2)
     deadlock_retry (1.1.2)
     dynamic_form (1.1.4)
     erubis (2.7.0)
@@ -157,7 +157,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)
-  composite_primary_keys (>= 4.1.2)
+  composite_primary_keys (>= 5.0.0.rc1)
   deadlock_retry (>= 1.1.2)
   dynamic_form
   http_accept_language (>= 1.0.2)