From 486f187cb7fea0d23b3527268eb7bfe773a75570 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 23 Jan 2012 18:27:47 +0000
Subject: [PATCH] Require composite_primary_keys 5.0.0.rc1

---
 Gemfile      | 2 +-
 Gemfile.lock | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Gemfile b/Gemfile
index e2e822ba4..0e101dc39 100644
--- 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 2291fc0d9..98ab8b98e 100644
--- 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)
-- 
2.43.2