From c8fd34b178f90af59e2f0867fbdc03585f338e76 Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Mon, 2 Jul 2012 08:50:33 +0100
Subject: [PATCH] Update to version 5.0.8 of composite_primary_keys

---
 Gemfile      |  2 +-
 Gemfile.lock | 29 ++++++++++++++++-------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Gemfile b/Gemfile
index 3e83536b1..7109b1236 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'rinku', '>= 1.2.2', :require => 'rails_rinku'
 gem 'openstreetmap-oauth-plugin', '>= 0.4.0.1', :require => 'oauth-plugin'
 gem 'open_id_authentication', '>= 1.1.0'
 gem 'validates_email_format_of', '>= 1.5.1'
-gem 'composite_primary_keys', '= 5.0.4'
+gem 'composite_primary_keys', '>= 5.0.8'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
 gem 'deadlock_retry', '>= 1.2.0'
diff --git a/Gemfile.lock b/Gemfile.lock
index f434a6a68..35b50a361 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -41,7 +41,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.3.3)
-    composite_primary_keys (5.0.4)
+    composite_primary_keys (5.0.8)
       activerecord (~> 3.2.0)
     deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
@@ -62,24 +62,27 @@ GEM
       railties (>= 3.2.0, < 5.0)
       thor (~> 0.14)
     json (1.7.3)
+    jwt (0.1.4)
+      json (>= 1.2.4)
     libv8 (3.3.10.4)
-    libxml-ruby (2.3.2)
+    libxml-ruby (2.3.3)
     mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     memcached (1.4.2)
-    mime-types (1.18)
-    minitest (3.1.0)
+    mime-types (1.19)
+    minitest (3.2.0)
     multi_json (1.3.6)
     multipart-post (1.1.5)
-    nokogiri (1.5.4)
+    nokogiri (1.5.5)
     oauth (0.4.6)
-    oauth2 (0.7.1)
+    oauth2 (0.8.0)
       faraday (~> 0.8)
       httpauth (~> 0.1)
+      jwt (~> 0.1.4)
       multi_json (~> 1.0)
-      rack (~> 1.4)
+      rack (~> 1.2)
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     openstreetmap-oauth-plugin (0.4.0.1)
@@ -92,7 +95,7 @@ GEM
       activesupport (>= 2.3.2)
       cocaine (>= 0.0.2)
       mime-types
-    pg (0.13.2)
+    pg (0.14.0)
     polyglot (0.3.3)
     rack (1.4.1)
     rack-cache (1.2)
@@ -129,7 +132,7 @@ GEM
     ruby-openid (2.1.8)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
-    sass (3.1.19)
+    sass (3.1.20)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
       sass (>= 3.1.10)
@@ -140,16 +143,16 @@ GEM
       tilt (~> 1.1, != 1.3.0)
     therubyracer (0.10.1)
       libv8 (~> 3.3.10)
-    thor (0.15.2)
+    thor (0.15.4)
     tilt (1.3.3)
     timecop (0.3.5)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.33)
-    uglifier (1.2.4)
+    uglifier (1.2.6)
       execjs (>= 0.3.0)
-      multi_json (>= 1.0.2)
+      multi_json (~> 1.3)
     validates_email_format_of (1.5.3)
 
 PLATFORMS
@@ -160,7 +163,7 @@ DEPENDENCIES
   bigdecimal
   browser
   coffee-rails (~> 3.2.1)
-  composite_primary_keys (= 5.0.4)
+  composite_primary_keys (>= 5.0.8)
   deadlock_retry (>= 1.2.0)
   dynamic_form
   htmlentities
-- 
2.43.2