From: Tom Hughes <tom@compton.nu>
Date: Wed, 9 Feb 2011 21:46:47 +0000 (+0000)
Subject: Update to rails 3.0.4 and composite_primary_keys 3.1.1
X-Git-Tag: live~6138
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/b6ebd640f898b6b0d52a6b95603f8db484b256d9?ds=sidebyside

Update to rails 3.0.4 and composite_primary_keys 3.1.1
---

diff --git a/Gemfile b/Gemfile
index c697da9b1..7b9168fc9 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.3'
+gem 'rails', '3.0.4'
 
 gem 'pg'
 gem 'libxml-ruby', '>= 2.0.5', :require => 'libxml'
@@ -17,7 +17,7 @@ gem 'validates_email_format_of', '>= 1.4.2'
 gem 'memcached'
 
 # Should only load if we're not in database offline mode
-gem 'composite_primary_keys', '>= 3.0.9'
+gem 'composite_primary_keys', '>= 3.1.1'
 
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators