From: Tom Hughes <tom@compton.nu>
Date: Fri, 4 Nov 2011 09:36:11 +0000 (+0000)
Subject: Require composite_primary_keys 4.1.1 for rails 3.1.1 support
X-Git-Tag: live~6078
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/05ed7cdfa5833ae834b1c9dd622430eb8a3ab10d?hp=9c28a626cbefd289d17556747979bd73ee3a77cd

Require composite_primary_keys 4.1.1 for rails 3.1.1 support
---

diff --git a/Gemfile b/Gemfile
index dc777110f..3705bc798 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.0.0'
+gem 'composite_primary_keys', '>= 4.1.1'
 
 # Load libxml support for XML parsing and generation
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
diff --git a/Gemfile.lock b/Gemfile.lock
index 31598453c..a48649f4d 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,8 +40,8 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.1.2)
-    composite_primary_keys (4.0.0)
-      activerecord (~> 3.1.0)
+    composite_primary_keys (4.1.1)
+      activerecord (~> 3.1)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.2.9)
@@ -49,22 +49,23 @@ GEM
     faraday (0.7.5)
       addressable (~> 2.2.6)
       multipart-post (~> 1.1.3)
-      rack (>= 1.1.0, < 2)
+      rack (< 2, >= 1.1.0)
     hike (1.2.1)
-    httpclient (2.2.1)
+    httpclient (2.2.3)
     i18n (0.6.0)
+    json (1.6.1)
     libxml-ruby (2.2.2)
     mail (2.3.0)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    memcached (1.3.3)
-    mime-types (1.16)
+    memcached (1.3.5)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     multipart-post (1.1.3)
     nokogiri (1.5.0)
     oauth (0.4.5)
-    oauth-plugin (0.4.0.pre7)
+    oauth-plugin (0.4.0.rc2)
       multi_json
       oauth (~> 0.4.4)
       oauth2
@@ -75,10 +76,10 @@ GEM
     open_id_authentication (1.1.0)
       rack-openid (~> 1.3)
     pg (0.11.0)
-    polyglot (0.3.2)
+    polyglot (0.3.3)
     prototype-rails (3.1.0)
       rails (~> 3.1)
-    rack (1.3.4)
+    rack (1.3.5)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
@@ -109,8 +110,9 @@ GEM
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
-    rake (0.9.2)
-    rdoc (3.9.4)
+    rake (0.9.2.2)
+    rdoc (3.11)
+      json (~> 1.4)
     rinku (1.2.2)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
@@ -123,7 +125,7 @@ GEM
       sass (>= 3.1.4)
       sprockets (~> 2.0.0)
       tilt (~> 1.3.2)
-    sprockets (2.0.2)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
@@ -134,10 +136,10 @@ GEM
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.30)
-    uglifier (1.0.3)
+    uglifier (1.0.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
-    validates_email_format_of (1.5.2)
+    validates_email_format_of (1.5.3)
 
 PLATFORMS
   ruby
@@ -145,7 +147,7 @@ PLATFORMS
 DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.1.0)
-  composite_primary_keys (= 4.0.0)
+  composite_primary_keys (>= 4.1.1)
   dynamic_form
   httpclient
   libxml-ruby (>= 2.0.5)