From 9730e5e0958f1dae5042f1121c1b952708242978 Mon Sep 17 00:00:00 2001
From: George Vinogradov <g.vinogradov@itima.ru>
Date: Thu, 2 Feb 2012 18:29:35 +0400
Subject: [PATCH] [issue #64] DJ version set to 2.1.4

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

diff --git a/Gemfile b/Gemfile
index 482de2eb2..60d46fd36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -30,7 +30,7 @@ gem 'grack', :git => 'git://github.com/rdblue/grack.git', :require => 'git_http'
 gem "grit", :git => 'git://github.com/mojombo/grit.git', :branch => 'master'
 #gem "grit", :git => 'git://github.com/github/grit.git', :branch => 'master'
 gem 'whenever', :require => false
-gem 'delayed_job'
+gem 'delayed_job', '2.1.4'
 gem 'highline', '~> 1.6.8'
 
 # Wiki
diff --git a/Gemfile.lock b/Gemfile.lock
index 53f6adb37..d71c4ed97 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -75,8 +75,9 @@ GEM
     cocaine (0.2.1)
     creole (0.4.2)
     daemons (1.1.6)
-    delayed_job (3.0.1)
+    delayed_job (2.1.4)
       activesupport (~> 3.0)
+      daemons
     devise (1.5.3)
       bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
@@ -248,7 +249,7 @@ DEPENDENCIES
   capistrano-ext
   capistrano_colors
   creole
-  delayed_job
+  delayed_job (= 2.1.4)
   devise (~> 1.5.2)
   factory_girl_rails (~> 1.4.0)
   gollum (= 1.3.1)