From 26b0a14d2771ab72681ee128f95a3303969dceef Mon Sep 17 00:00:00 2001 From: Andrew Cantino Date: Thu, 14 Mar 2013 22:02:44 -0700 Subject: [PATCH] try to fix delayed_job yaml issue --- Gemfile | 1 + Gemfile.lock | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index a95672ca2f..c605f946a5 100644 --- a/Gemfile +++ b/Gemfile @@ -9,6 +9,7 @@ gem 'bootstrap-kaminari-views' gem "rufus-scheduler", :require => false gem 'json', '>= 1.7.7' +gem 'delayed_job', :git => 'https://github.com/wok/delayed_job' # Until the YAML issues are fixed in master. gem 'delayed_job_active_record', "~> 0.3.3" # newer was giving a strange MySQL error gem "daemons" # gem "delayed_job_web" diff --git a/Gemfile.lock b/Gemfile.lock index 574127e04a..db205f814d 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,3 +1,10 @@ +GIT + remote: https://github.com/wok/delayed_job + revision: d1f53b489a13146f6b2ac27ef26b2e2dc6ae558c + specs: + delayed_job (3.0.4) + activesupport (~> 3.0) + GEM remote: https://rubygems.org/ specs: @@ -56,8 +63,6 @@ GEM cookiejar (0.3.0) crack (0.3.2) daemons (1.1.9) - delayed_job (3.0.5) - activesupport (~> 3.0) delayed_job_active_record (0.3.3) activerecord (>= 2.1.0, < 4) delayed_job (~> 3.0) @@ -263,6 +268,7 @@ DEPENDENCIES capistrano-unicorn coffee-rails (~> 3.2.1) daemons + delayed_job! delayed_job_active_record (~> 0.3.3) devise em-http-request