From fe3eaafd3e4e3867147e73c75389dc4e82e64718 Mon Sep 17 00:00:00 2001 From: Tom Hughes Date: Fri, 1 Jun 2012 15:34:28 +0100 Subject: [PATCH] Stick with CPK 5.0.4 for now as later versions seem to fail --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index e2d0b0c75..10f38eb38 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.0' +gem 'composite_primary_keys', '= 5.0.4' 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 cdaea25f3..ed69bc8ad 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -40,7 +40,7 @@ GEM coffee-script-source execjs coffee-script-source (1.3.3) - composite_primary_keys (5.0.6) + composite_primary_keys (5.0.4) activerecord (~> 3.2.0) deadlock_retry (1.2.0) dynamic_form (1.1.4) @@ -158,7 +158,7 @@ DEPENDENCIES SystemTimer (>= 1.1.3) bigdecimal coffee-rails (~> 3.2.1) - composite_primary_keys (>= 5.0.0) + composite_primary_keys (= 5.0.4) deadlock_retry (>= 1.2.0) dynamic_form htmlentities -- 2.43.2