Permalink
Browse files

Merge remote-tracking branch 'mongoid_fix/master'

Conflicts:
	lib/backgrounder/orm/base.rb
  • Loading branch information...
2 parents dce6ec0 + 8b9e48e commit 7e00510f901024091ed1bf9834a7c0eb95a0c7e6 @vtabary committed Aug 27, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/backgrounder/orm/base.rb
View
6 lib/backgrounder/orm/base.rb 100644 → 100755
@@ -51,11 +51,11 @@ def set_#{column}_processing
def enqueue_#{column}_background_job
if defined? ::GirlFriday
- CARRIERWAVE_QUEUE << { :worker => #{worker}.new(self.class.name, id, #{column}.mounted_as) }
+ CARRIERWAVE_QUEUE << { :worker => #{worker}.new(self.class.name, id.to_s, #{column}.mounted_as) }
elsif defined? ::Delayed::Job
- ::Delayed::Job.enqueue #{worker}.new(self.class.name, id, #{column}.mounted_as)
+ ::Delayed::Job.enqueue #{worker}.new(self.class.name, id.to_s, #{column}.mounted_as)
elsif defined? ::Resque
- ::Resque.enqueue #{worker}, self.class.name, id, #{column}.mounted_as
+ ::Resque.enqueue #{worker}, self.class.name, id.to_s, #{column}.mounted_as
elsif defined? ::Qu
::Qu.enqueue #{worker}, self.class.name, id, #{column}.mounted_as
elsif defined? ::Sidekiq

0 comments on commit 7e00510

Please sign in to comment.