Merge with em

mceachen · Jul 10, 2011 · 9285515 · 9285515
2 parents 4a982b7 + 09798ff
commit 9285515
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
 *.gem
 *.swp
 Gemfile.lock
+.idea/
+.bundle/
diff --git a/lib/delayed/backend/active_record.rb b/lib/delayed/backend/active_record.rb
@@ -23,7 +23,6 @@ class Job < ::ActiveRecord::Base
 
         scope :ready_to_run, lambda {|worker_name, max_run_time|
           includes(:prerequisites).where(['(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL AND delayed_job_prerequisites.job_id IS NULL', db_time_now, db_time_now - max_run_time, worker_name])
-          where(['(run_at <= ? AND (locked_at IS NULL OR locked_at < ?) OR locked_by = ?) AND failed_at IS NULL', db_time_now, db_time_now - max_run_time, worker_name])
         }
         scope :by_priority, order('priority ASC, run_at ASC')