From 8c1b27836d863f6ad5637d3bb35bc32ab4f020e9 Mon Sep 17 00:00:00 2001
From: Alex Coles <alex@alexbcoles.com>
Date: Thu, 6 Nov 2014 00:43:31 +0100
Subject: [PATCH] Uncomment delayed_job dependency, config; Bump

Bumps delayed_job_active_record to latest (4.0.x)

Signed-off-by: Alex Coles <alex@alexbcoles.com>
---
 Gemfile                                   | 5 +----
 {script => bin}/delayed_job               | 0
 config/initializers/delayed_job_config.rb | 4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)
 rename {script => bin}/delayed_job (100%)

diff --git a/Gemfile b/Gemfile
index 7a606bf9f1..098cd17282 100644
--- a/Gemfile
+++ b/Gemfile
@@ -69,10 +69,7 @@ gem 'rabl', '0.9.3'
 gem 'multi_json'
 gem 'oj'
 
-# we need the old Version to be compatible with pgsql 8.4
-# see: http://stackoverflow.com/questions/14862144/rake-jobswork-gives-pgerror-error-select-for-update-share-is-not-allowed-in
-# or: https://github.com/collectiveidea/delayed_job/issues/323
-# gem 'delayed_job_active_record', '0.3.3'
+gem 'delayed_job_active_record', '~> 4.0.2'
 gem 'daemons'
 
 # include custom rack-protection for now until rkh/rack-protection is fixed and released
diff --git a/script/delayed_job b/bin/delayed_job
similarity index 100%
rename from script/delayed_job
rename to bin/delayed_job
diff --git a/config/initializers/delayed_job_config.rb b/config/initializers/delayed_job_config.rb
index 097267f3f5..6cc9eaeb33 100644
--- a/config/initializers/delayed_job_config.rb
+++ b/config/initializers/delayed_job_config.rb
@@ -28,7 +28,7 @@
 #++
 
 # log delayed job's output to whatever rails logs to
-# Delayed::Worker.logger = Rails.logger
+Delayed::Worker.logger = Rails.logger
 
 # By default bypass worker queue and execute asynchronous tasks at once
-# Delayed::Worker.delay_jobs = !Rails.env.test?
+Delayed::Worker.delay_jobs = !Rails.env.test?