From 574407e2baa079c503d1629d96d65b381da2966a Mon Sep 17 00:00:00 2001
From: Tom Hughes <tom@compton.nu>
Date: Wed, 15 Feb 2012 08:35:05 +0000
Subject: [PATCH 1/1] Require version 1.2.0 of deadlock retry for postgres
 support

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Gemfile b/Gemfile
index a89169cfa..98962574e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,7 +20,7 @@ gem 'validates_email_format_of', '>= 1.5.1'
 gem 'composite_primary_keys', '>= 5.0.0'
 gem 'http_accept_language', '>= 1.0.2'
 gem 'paperclip', '~> 2.0'
-gem 'deadlock_retry', '>= 1.1.2'
+gem 'deadlock_retry', '>= 1.2.0'
 
 # Character conversion support for ruby 1.8
 gem 'iconv', :platforms => :ruby_18
diff --git a/Gemfile.lock b/Gemfile.lock
index 1bbc63f46..98a25e9ab 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -40,9 +40,9 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.2.0)
-    composite_primary_keys (5.0.0)
+    composite_primary_keys (5.0.1)
       activerecord (~> 3.2.0)
-    deadlock_retry (1.1.2)
+    deadlock_retry (1.2.0)
     dynamic_form (1.1.4)
     erubis (2.7.0)
     execjs (1.3.0)
@@ -123,7 +123,7 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rinku (1.5.0)
+    rinku (1.5.1)
     rmagick (2.13.1)
     ruby-openid (2.1.8)
     sanitize (2.0.3)
@@ -158,7 +158,7 @@ DEPENDENCIES
   SystemTimer (>= 1.1.3)
   coffee-rails (~> 3.2.1)
   composite_primary_keys (>= 5.0.0)
-  deadlock_retry (>= 1.1.2)
+  deadlock_retry (>= 1.2.0)
   dynamic_form
   http_accept_language (>= 1.0.2)
   httpclient
-- 
2.43.2