Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: tobi/delayed_job
base: master
...
head fork: collectiveidea/delayed_job
Checking mergeability… Don't worry, you can still create the pull request.
This comparison is big! We're only showing the most recent 250 commits
Commits on Jan 26, 2013
@sferik sferik Test against Ruby 2.0.0 14b18a5
@sferik sferik Convert text files to Markdown 5b5f971
Commits on Jan 28, 2013
@albus522 albus522 Merge branch 'exit-when-done'
Conflicts:
	README.md
bc25265
@albus522 albus522 Merge branch 'signal-handling' 99ff299
@albus522 albus522 Prepare 3.0.5 release 969a550
Commits on Feb 06, 2013
@sferik sferik Don't implicitly require simplecov 00c5a48
Commits on Feb 09, 2013
@sferik sferik Update Code Climate badge [ci skip] 3f1b378
Commits on Feb 14, 2013
@sferik sferik The source :rubygems is deprecated because HTTP requests are insecure. 03c34c4
Commits on Feb 15, 2013
@ngan ngan Use AR's implementation of #encode_with which uses attributes instead…
… of @attributes

As of Rails 3.2.12, they can return different things.
For example, if the `foorbars` table has an integer column called "size" with default 0 and not null:

f = Foobar.new
f.attributes["size"].class #=> Fixnum
f.instance_eval{@attributes}["size"].class #=> Arel::Nodes::SqlLiteral

This fixes an issue where:

Foobar.new.to_yaml

would raise an error:
ArgumentError: wrong number of arguments (2 for 1)
  from gems/arel-3.0.2/lib/arel/expressions.rb:3:in `count'
bcbdde4
@albus522 albus522 Merge pull request #479 from ngan/patch-1
Use AR#attributes instead of the instance variable
19b00fa
Commits on Feb 18, 2013
@albus522 albus522 Fix attempt to update Psych encode_with 8158549
Commits on Feb 22, 2013
@davidakachaos davidakachaos Fixes a adjustedment made to the YAML part of Ruby daf515a
Commits on Feb 23, 2013
@nickmerwin nickmerwin Added coveralls.io coverage badge 1fe5810
@nickmerwin nickmerwin added coveralls gem, updated spec_helper 6dfe746
@sferik sferik Merge pull request #485 from lemurheavy/master
Added code coverage badge.
9882489
@nickmerwin nickmerwin updated coverage badge image / url
Uses https://coveralls.io/r/collectiveidea/delayed_job instead of the lemurheavy/delayed_job fork.
7aa4726
@sferik sferik Merge pull request #486 from nickmerwin/patch-1
updated coverage badge image / url
7432513
Commits on Feb 25, 2013
@davidakachaos davidakachaos Fixing errors reported by Travis
Should have run rake first before commiting -.- But now it passes!
5e34e6c
Commits on Feb 26, 2013
@hasimo hasimo add support for rails 4.0 21b7956
@davidakachaos davidakachaos See if we need this exception or not d0002bd
Commits on Mar 01, 2013
@sferik sferik Make specs more compatible with Rails 4 b90a3a4
Commits on Mar 02, 2013
@sferik sferik Merge pull request #490 from hasimo/rails4
support for rails 4.0
ebf70f0
@sferik sferik Fix activesupport dependency specification aba20b9
@sferik sferik Rename spec_helper to spec/helper d734a3c
@sferik sferik Handle dependencies in the gemspec cdd98b6
@sferik sferik Prepare 4.0.0.beta1 release 7d3704b
Commits on Mar 17, 2013
@YesThatAllen YesThatAllen Adding information about restarting delayed jobs
This is information I believe is correct, but I would love to know for certain
474741f
Commits on Mar 20, 2013
@parndt parndt Added missing Ruby highlighting to README.md 090b34b
Commits on Mar 22, 2013
@pjungwir pjungwir Documented _without_delay feature 1330984
@aripollak aripollak Log more information about running jobs in the worker cbacaad
@aripollak aripollak Fix Ruby 1.8 compatibility 1012277
Commits on Apr 01, 2013
@albus522 albus522 Fix ActiveRecord::Base#encode_with for Rails 3.0 dcf414b
@albus522 albus522 Run the tests against all versions of Rails we claim to support 2b68059
@albus522 albus522 Bring back fail-fast
So we don't hog Travis resources
b78c98f
Commits on Apr 02, 2013
@albus522 albus522 Ruby 1.9.2 doesn't like coveralls being loaded before DJ fd311a8
@albus522 albus522 Rails 4 is for Ruby >= 1.9.3 only cfdf8da
Commits on Apr 08, 2013
@sferik sferik Merge pull request #504 from parndt/patch-1
Added missing Ruby highlighting to README.md
eca9611
@sferik sferik Merge pull request #508 from aripollak/more-logging
Log more information about jobs being run
5278030
Commits on Apr 30, 2013
@bryckbost bryckbost Merge branch 'document-without_delay' of https://github.com/pjungwir/…
…delayed_job into pjungwir-document-without_delay

* 'document-without_delay' of https://github.com/pjungwir/delayed_job:
  Documented _without_delay feature
3ce54db
@bryckbost bryckbost Merge branch 'patch-1' of https://github.com/allenhancock/delayed_job
…into allenhancock-patch-1

* 'patch-1' of https://github.com/allenhancock/delayed_job:
  Adding information about restarting delayed jobs
be8405e
@bryckbost bryckbost Update documentation on restarting DJ fe0fa6c
Commits on May 05, 2013
@mmb mmb Add jobs:check rake task to test for liveness.
This task exits with failure status if there are old jobs that have
not been picked up by workers. This can be used for monitoring.
44c680e
Commits on May 12, 2013
@sferik sferik Merge pull request #384 from alexisbernard/parallelize_restart
Parallelize stop and restart to be faster with many workers
4aa0bc5
@sferik sferik Merge pull request #517 from mmb/jobs_check_task
Add jobs:check rake task to test for liveness.
d6cbf48
Commits on May 17, 2013
@gpai-mdsol gpai-mdsol Update README.md
Document the changes that were made in the pull request:
https://github.com/collectiveidea/delayed_job/pull/168/files

Looking at the code in that PR I figured that the max_attempts needs to be set on the payload and I tried setting it on the custom job and it worked as expected. This feature is indeed very useful and hopefully this is well-documented and maintained in future releases. Greatly appreciate this gem!

A question - would this work with the object.delay.some_method usage. Didn't seem like it would since the DB table does not have the max_attempts as a column.
443c6aa
Commits on May 21, 2013
@tatey tatey Add a compatibility module based on ActiveSupport version.
* Refactored version switching into Delayed::Compatibility.
a0b0ac8
@tatey tatey Generate delayed_job executable based on ActiveSupport version.
* Rails 4 compatibility.
6192b6c
@albus522 albus522 Merge pull request #519 from gpai-mdsol/patch-1
Update README.md to document max attempts configurable per job
acb72e5
Commits on May 28, 2013
@albus522 albus522 Prepare 4.0.0.beta2 release cde95f3
Commits on May 31, 2013
@davidakachaos davidakachaos Better way to detect method present
Thanks to @sferik for the catch
f3e5de7
@sferik sferik Merge pull request #483 from davidakachaos/fix_yaml_error
Fixes a adjustedment made to the YAML part of Ruby
80ad1f0
Commits on Jun 02, 2013
@brocktimus brocktimus Documented the Delayed::Worker.default_queue_name option f6d2ed7
@sferik sferik Merge pull request #529 from brocktimus/master
Add default queue name to README
fa22baa
Commits on Jul 04, 2013
@mgomes1 mgomes1 Exception handling during job reservation 2f11681
Commits on Jul 10, 2013
@tiegz tiegz update some deprecated rspec methods 0a2ccda
@albus522 albus522 Merge pull request #540 from tiegz/spec_deps
Update some rspec methods that warn of deprecations.
91a07b2
@albus522 albus522 Specs need to pass against rails 4 for a passing build 16cfc05
@albus522 albus522 Stop testing against ruby 1.8
Ruby 1.8 has been EOL'ed and our build matrix is much bigger than it needs to be
8ee9138
@albus522 albus522 Add more details to the contributing guide 44edd94
Commits on Jul 21, 2013
@omerisimo omerisimo Allow payload objects to define a queue name 82dd181
@omerisimo omerisimo Merge branch 'master' into custom_job_queue_name 2f707d7
Commits on Jul 30, 2013
@albus522 albus522 Revert "Parallelize stop and restart to be faster with many workers."
Daemons has major issues dealing with threaded daemonizing
This reverts commit 7757209.
cf20859
@albus522 albus522 Merge remote-tracking branch 'origin/pr/537' 8a14cb5
@albus522 albus522 Prevent a worker from entering an infinite backend error loop 27348ee
@albus522 albus522 Provide a hook for a DJ backend to attempt recovery from a reservatio…
…n error

An example usage would be for DJ active record to reconnect if mysql "goes away"
95deddc
@albus522 albus522 Prepare 4.0.0 release
[ci-skip]
19a574f
Commits on Jul 31, 2013
@omerisimo omerisimo Fix typo in shared_spec.rb 0a381e5
Commits on Aug 20, 2013
@klochner klochner Update README.md
fix method signature for failure callback in README
1232835
Commits on Aug 21, 2013
@albus522 albus522 Merge pull request #563 from klochner/master
Update README.md
812f10b
Commits on Aug 28, 2013
@albus522 albus522 Add a note about Rails 4 to the README 6f06848
Commits on Sep 06, 2013
@nickveys nickveys Adding specs for #max_run_time 237966b
@nickveys nickveys Implementing #max_run_time override support 3e91125
@nickveys nickveys Fixing typo in max_attempts spec fbb704e
Commits on Sep 18, 2013
@mutley mutley fix one character typo 27d24dc
@albus522 albus522 Merge pull request #580 from mutley/master
fix one character typo
02c7032
Commits on Oct 16, 2013
@prakashmurthy prakashmurthy Fix the link for backends wiki page in README.md c40325a
@albus522 albus522 Merge pull request #591 from prakashmurthy/patch-1
Fix the link for backends wiki page in README.md
3ba4f65
Commits on Nov 11, 2013
Jeffrey Horn Change require to rails/generators/base 20e533f
Commits on Nov 15, 2013
@beerlington beerlington Adds note about running delayed mailer b0d542a
@albus522 albus522 Merge pull request #598 from beerlington/patch-1
Adds note about running delayed mailer
2f02f64
Commits on Nov 18, 2013
@tubaxenor tubaxenor Use ActiveRecord#persisted? instead of ActiveRecord#new_record?
When record was destroyed, it will return false when new_record? called :
```
u = User.first
>> u.new_record?
=> false
>> u.persisted?
=> true

>> u.destroy

>> u.new_record?
=> false
>> u.persisted?
=> false
```
I think persisted? is more appropriate here.
1f179dc
Commits on Nov 20, 2013
@tubaxenor tubaxenor Fix specs f208532
Commits on Dec 04, 2013
@amatsuda amatsuda Object#extend is a public method 451bd12
Commits on Jan 07, 2014
@bethesque bethesque Defined missing class Delayed::FatalBackendError 346a697
Commits on Jan 08, 2014
@sferik sferik Show all errors by default 7eba05f
@sferik sferik Update to latest RSpec syntax 932d536
@sferik sferik Update Travis CI matrix 627192d
@sferik sferik Added @brixen as a collaborator, who will ensure builds pass on Rubinius 365e140
Commits on Jan 09, 2014
@bethesque bethesque Moved FatalBackendError to exceptions.rb file. 3bfecbb
Commits on Feb 03, 2014
@sferik sferik rubysl-json was yanked by @brixen; use json instead 885074f
Commits on Feb 09, 2014
@brixen brixen Update Travis settings for Rubinius. b435895
Commits on Mar 11, 2014
@joelr joelr Readme around raise_signal_exceptions option
Allow increased visiblity around raise_signal_exceptions option which isn't obviously documented. This is helpful particular for those using Heroku which uses SIGTERMs quite liberally.
fb49f60
Commits on Mar 17, 2014
@bethesque bethesque Altering Delayed::Command to work with or without Rails 2478a92
Commits on Mar 20, 2014
@sergey-alekseev sergey-alekseev do not subclass Struct class 4d8def8
Commits on Apr 05, 2014
@xrx xrx * Modified the Worker#say method to be able to handle other loggers a…
…s "Syslog" that use their "add" method for other purposes.
e7f5aa1
Commits on Apr 09, 2014
@MSch MSch Change activesupport dependency to < 4.2 3e1a9e1
@albus522 albus522 Complete dependency update 827a7e2
@albus522 albus522 Cleanup Worker#say 1983429
@albus522 albus522 Merge pull request #638 from sergey-alekseev/master
do not subclass Struct class (update in README)
0bd3e9a
@albus522 albus522 Merge pull request #647 from MSch/master e8c1d0c
@albus522 albus522 Merge pull request #646 from xrx/make_the_worker_say_method_more_flex…
…ible
8c69388
@albus522 albus522 Update travis link 56dc875
@albus522 albus522 Attempt to get travis green again b2e522f
@albus522 albus522 Add missing exception class
[Fixes #571]
542f3ec
@albus522 albus522 Merge remote-tracking branch 'origin/pr/627'
Conflicts:
	.travis.yml
d3a2765
@albus522 albus522 Merge remote-tracking branch 'origin/pr/614' 5921245
@albus522 albus522 Cleanup my out of place commit 0728707
@albus522 albus522 Merge remote-tracking branch 'origin/pr/608' ede5974
@albus522 albus522 Merge pull request #600 from tubaxenor/patch-1
Use ActiveRecord#persisted? instead of ActiveRecord#new_record?
06a4598
@albus522 albus522 Use strings for say's log level 255c61c
@albus522 albus522 Update jruby travis config de8d413
Commits on Apr 12, 2014
@albus522 albus522 Prepare 4.0.1 release 62fd8ab
Commits on Apr 26, 2014
@jonaphin jonaphin configurable default log level a834eb0
Commits on May 02, 2014
@Dorian Dorian Show object when throwing "non-persisted record" error
When calling `delay` on a non-persisted record, the error raised now also contains the details about the object.

This make debugging this error easier. And is consistent with the previous error.
59f072d
Commits on May 23, 2014
@denisahearn denisahearn Added error handling when job fails permanently and failure callback …
…raises an exception
4f7563a
Commits on Jun 12, 2014
@betamatt betamatt Added a convenient place to point people needing questions answered. 5b08ccd
Commits on Jun 18, 2014
@michaelboutros michaelboutros Added sleep_delay and read_ahead to options for rake tasks. 110f0e2
Commits on Jun 24, 2014
@sferik sferik Update rspec dependency to >= 3 5f2b46e
@sferik sferik Prepare 4.0.2 release 0911146
Commits on Jun 25, 2014
@sferik sferik Add RuboCop ca7279e
@sferik sferik Fix RuboCop offenses d3ce893
@sferik sferik Enforce code coverage minimums 697d81d
@sferik sferik With the release of Rails 4, Rails 3.0 and 3.1 are no longer supported 42b1489
Commits on Jun 26, 2014
@splattael splattael Fix YAML deserialization of anonymous structs
`DelayedJob` makes freedom patches of `Psych`'s `resolve_class` method.
It misses to guard this method from empty class names.

`Psych` does it:
https://github.com/tenderlove/psych/blob/2c644e18/lib/psych/class_loader.rb#L25

While deserializing an anonymous struct the class name is an empty
string (`""`). Constantizing an empty string resolves to `Object`.

This leads to this error:

    #<NoMethodError: undefined method `members' for #<Object:0xXXXXXXX>>

After this commit deserializing anonymous structs works again.
d82fe26
Commits on Jun 27, 2014
@denisahearn denisahearn Resolved merge conflicts with changes in upstream repo's master branch ecbc39f
@denisahearn denisahearn Fixed Rubocop offenses with code introduced in my pull request bb606e2
Commits on Jul 05, 2014
@denisahearn denisahearn Changed usage of Logger::ERROR to 'error' within Delayed::Worker#failed ea2c1f9
Commits on Jul 07, 2014
@albus522 albus522 Merge pull request #661 from denisahearn/master
Added error handling when job fails permanently and failure callback rai...
b8ecbf1
Commits on Jul 08, 2014
@ndbroadbent ndbroadbent Added --pools argument, so that multiple worker pools can be defined …
…with different queues and number of workers.
0584b1f
@ndbroadbent ndbroadbent Use multiple --pool options, instead of one --pools option. ca8ede6
Commits on Jul 20, 2014
@sferik sferik Update simplecov dependency to >= 0.9 d665adf
@sferik sferik Ignore failure of Rubinius 2 builds 6280813
Commits on Jul 25, 2014
@scpike scpike Remove Psych deserialization extensions 21e6c55
Commits on Jul 31, 2014
@ehsanul ehsanul Bugfix for `encode_with_override` psych extension
The `coder` passed to ActiveRecord::Base#encode_with does not necessarily have
a `tag=` method (it may just be a Hash). This causes issues with other callers,
eg https://github.com/Shopify/identity_cache/blob/master/lib/identity_cache/query_api.rb#L140

Conflicts:
	lib/delayed/psych_ext.rb
00c09bd
@BMorearty BMorearty I think Rubocop got confused by the method definitions inside an `if`. b54409f
Commits on Aug 05, 2014
Adarsh Pandit Add syntax highlighting to config code docs
Skimming the "Gory Details" section, it was tough to find where the various configuration details were described.
e8e34eb
@albus522 albus522 Merge pull request #683 from adarsh/patch-1
Add syntax highlighting to config code docs
513a4b0
Commits on Aug 07, 2014
@albus522 albus522 Merge pull request #679 from scpike/remove-psych-extensions
Remove Psych deserialization extensions
aa890a7
@albus522 albus522 Make rubocop happier dbc4e3c
@albus522 albus522 Merge pull request #681 from godaddy/fix_encode_with_override
Bugfix for `encode_with_override` psych extension
bce70c3
@albus522 albus522 Merge pull request #606 from ndbroadbent/multiple_queue_support
Added --pool option, so that multiple worker pools can be defined with different queues and numbers of workers.
0ece42f
@albus522 albus522 Rubocop adjustments 1dc7cc1
Commits on Aug 08, 2014
@albus522 albus522 Revert "Make rubocop happier"
This reverts commit dbc4e3c.

Not sure what I was thinking
505132b
@albus522 albus522 Correctly stop rubocop from complaining fbac48d
@albus522 albus522 Tweek code coverage
Not really that useful for our code since different test configs test different areas
6fc9000
Commits on Aug 21, 2014
@sferik sferik Flip secret bit to enable Docker builds ede24db
@sferik sferik Update rubocop dependency to >= 0.25 9794c97
Commits on Aug 26, 2014
@albus522 albus522 Run tests against rails 4.2 beta d8d9473
Commits on Aug 27, 2014
@johnnaegle johnnaegle Fix tests under Rails 4.2.0.beta1 - Failing in travis with this: depr…
…ecated_sanitizer/version.rb:1:in `<top (required)>': Rails is not a module (TypeError) (https://travis-ci.org/collectiveidea/delayed_job/jobs/33634692)
7ab3f3a
Commits on Aug 28, 2014
@albus522 albus522 Merge pull request #689 from johnnaegle/feature/fix-rails-4.2-tests
Address tests failures under Rails 4.2.0.beta1 -
7d688a8
Commits on Sep 04, 2014
@tompave tompave Improved error reporting when deserializing a non-existent record (e.…
…g. because it was deleted).
5301862
@albus522 albus522 Better rubocop fb00bc1
@albus522 albus522 Revert "With the release of Rails 4, Rails 3.0 and 3.1 are no longer …
…supported"

This reverts commit 42b1489.

Conflicts:
	.travis.yml
	Gemfile
d015601
@albus522 albus522 Merge pull request #695 from collectiveidea/bring-back-3
Bring back 3.0
1ceb22c
@albus522 albus522 Prepare 4.0.3 release 2803220
Commits on Sep 18, 2014
@albus522 albus522 Run tests against rails latest b409873
@albus522 albus522 Handle active record attribute sets 3ace494
@albus522 albus522 Use delivery_now if available 67109b3
@albus522 albus522 Run all callbacks even if we aren't delaying execution 736c02f
@albus522 albus522 Pass options on to the worker daa9028
@albus522 albus522 Disable new rubocop check 3b90881
@albus522 albus522 Correct allowed failures c0e0a81
Commits on Sep 22, 2014
@Dorian Dorian fix specs non-persisted records error 68b153d
@Dorian Dorian Merge branch 'master' of https://github.com/collectiveidea/delayed_job
…into patch-1

Conflicts:
	lib/delayed/backend/shared_spec.rb
	lib/delayed/performable_method.rb
941adb7
Commits on Sep 23, 2014
@garethrees garethrees Pluck emails instead of find/collect
> Use pluck as a shortcut to select one or more attributes without
> loading a bunch of records just to grab the attributes you want.
>
>  – http://api.rubyonrails.org/classes/ActiveRecord/Calculations.html#method-i-pluck

Use `pluck` so that copy and pasted examples are faster.
79eb5aa
@albus522 albus522 Merge pull request #655 from Dorian/patch-1
Show object when throwing "non-persisted record" error
f9a07f4
@albus522 albus522 Merge pull request #709 from garethrees/patch-1
Pluck emails instead of find/collect
4bb1ce0
@brennovich brennovich Add custom Psych Visitor's behavior only for Delayed, not glabally da0aa6c
@brennovich brennovich Fix support for ruby 1.9.2 (Psych < 1.3.0) 78dac01
@brennovich brennovich Add support to Ruby 2.1 9babdf3
@albus522 albus522 Override even fewer YAML methods 055737b
@albus522 albus522 Don't override AR yaml generation a47e0d7
@albus522 albus522 Use a throw away log file e530194
@albus522 albus522 Merge branch 'pr/612' into separate-yaml
Conflicts:
	lib/delayed/psych_ext.rb
7c15a29
@albus522 albus522 Load psych in rubinius
It doesn't do this on its own
7a288ec
Commits on Sep 24, 2014
@albus522 albus522 Merge pull request #710 from collectiveidea/separate-yaml
Separate yaml
bb3d3a8
@albus522 albus522 Merge remote-tracking branch 'origin/pr/669' 56e8e71
@albus522 albus522 Merge remote-tracking branch 'origin/pr/653'
Conflicts:
	lib/delayed/worker.rb
	spec/worker_spec.rb
2b13953
@albus522 albus522 Merge remote-tracking branch 'origin/pr/632' c256904
@albus522 albus522 Update wording on signal handling afeeef5
@albus522 albus522 Logging within signal handlers is weird 293fa6c
@albus522 albus522 Merge pull request #597 from jrhorn424/fix-generator-require
Change require to rails/generators/base
cacda3c
@albus522 albus522 Merge remote-tracking branch 'origin/pr/574'
Conflicts:
	lib/delayed/backend/shared_spec.rb
2cfe2f5
@albus522 albus522 Merge remote-tracking branch 'origin/pr/547'
Conflicts:
	lib/delayed/backend/shared_spec.rb
af7fb40
@albus522 albus522 Correct use of stub 692786b
@albus522 albus522 Update and add documentation for job specific max_run_time ae0ca0a
@albus522 albus522 Make rubocop happy a8fc903
@albus522 albus522 Merge remote-tracking branch 'origin/pr/468'
Conflicts:
	lib/delayed/worker.rb
acdda42
@albus522 albus522 Merge remote-tracking branch 'origin/pr/460'
Conflicts:
	lib/delayed/backend/base.rb
6c64064
@albus522 albus522 Merge remote-tracking branch 'origin/pr/446'
Conflicts:
	spec/performable_method_spec.rb
3b7cabc
@albus522 albus522 Merge remote-tracking branch 'origin/pr/432'
Conflicts:
	lib/delayed/recipes.rb
a9a7950
@albus522 albus522 Prepare 4.0.4 release 5817625
Commits on Oct 03, 2014
@albus522 albus522 Allow user to override where DJ writes log output
Fixes #712
a4c3d65
@albus522 albus522 A limited attempt at automatic code reloading
If ActionDispatch::Reloader is available, introduced in Rails 3.1, we can use that to trigger the standard rails code reloading.
e432085
Commits on Oct 04, 2014
@Nowaker Nowaker Update README.md 946bc58
@Nowaker Nowaker Update README.md - document reschedule_at 3f43042
Commits on Oct 05, 2014
@albus522 albus522 Merge pull request #719 from Nowaker/patch-1
Update README.md
c85a4fe
Commits on Oct 08, 2014
@sferik sferik Don't package test files with gem [ci skip] 27ce6b0
Commits on Oct 09, 2014
@albus522 albus522 Merge remote-tracking branch 'origin/pr/720'
Conflicts:
	README.md
fea8f06
@albus522 albus522 Updated wording regarding reschedule_at dfd0a26
@albus522 albus522 Merge remote-tracking branch 'origin/pr/717' 80be799
@albus522 albus522 Add documentation for code reloading 62c929a
Commits on Oct 21, 2014
@albus522 albus522 One of the merges duplicated a lot of specs 6d0a6b2
Commits on Oct 31, 2014
@neilgupta neilgupta Fix undefined local variable or method `klass'
klass and id were not defined when deserializing ruby objects, causing an undefined error when trying to raise a DeserializationError. This should be fixed now.
aa2471a
Commits on Nov 03, 2014
@albus522 albus522 Fix rubocop updates e56e606
Commits on Nov 04, 2014
@isra17 isra17 Assign the error object to the job on failure 2ad2a0a
Commits on Dec 11, 2014
@sferik sferik Remove emtpy line from end of blocks 6b766a5
Commits on Dec 17, 2014
@rdpoor rdpoor Show how to add #handle_asynchronously to class methoda 23faf83
@rdpoor rdpoor Document adding handle_asynchronously to a class method 2415bf7
Commits on Dec 19, 2014
@albus522 albus522 Merge pull request #733 from neilgupta/undefined_klass
Fix undefined local variable or method `klass'
67b1355
@albus522 albus522 Merge pull request #752 from rdpoor/master
Document how to add handle_asynchronously to a class method
43c7d9c
@albus522 albus522 Simplify documentation on handle_async with a class method c1c37bf
@rdpoor rdpoor handle_asynchronously on class method in LongTasks
see  #752.
b356c38
Commits on Dec 22, 2014
@eitoball eitoball Change activesupport dependency to < 5.0 f3fa1ae
@sferik sferik Merge pull request #755 from eitoball/rails_4_2
Support Rails 4.2
5b47c4a
@sferik sferik Merge pull request #754 from rdpoor/master
handle_asynchronously on class method in LongTasks
51aa76e
@sferik sferik Prepare 4.0.5 release a91e3ac
@sferik sferik Revert "Don't package test files with gem"
These files are needed for shared specs in delayed_job_active_record,
delayed_job_mongoid, etc.

This reverts commit 27ce6b0.
b047b91
@sferik sferik Prepare 4.0.6 release c34d783
@cluesque cluesque Allow delay_jobs configuration to be a proc
decide whether to background one job at a time
ada2f25
Commits on Jan 05, 2015
@derwiki derwiki Add more information to Rails 4 in README
I suspect people who encounter this bug will search for the ActiveRecord exception. Adding the message to the README will lead them directly to the best source of the fix (I came through collectiveidea#730).
612c830
Commits on Jan 16, 2015
@albus522 albus522 Rescue Exception when performing job
Too much fallout from lowering to StandardError

Fixes #741
02f76e6
@albus522 albus522 Add a note about the ActiveJob queue_adapter
Fixes #767
ca228c6
@albus522 albus522 Tweak the note so upgraders notice
Fixes #711
5c24258
@albus522 albus522 Fix the link 1f88156
Commits on Jan 18, 2015
@edgibbs edgibbs Add ability to set destroy failed jobs on a per job basis 995ff6a
@edgibbs edgibbs Fix quoting issue for rubocop. 854e553
Commits on Jan 30, 2015
@brianhempel brianhempel Make Delayed::Worker.new idempotent
Calling Delayed::Worker.new multiple times would continue to re-add the
plugins to the lifecycle.

Some gems and projects use the pattern `Delayed::Worker.new.work_off` to
trigger delayed jobs in specs. Over time, the callback chain would get
very long and, in our case, caused a StackLevelTooDeep error.

Better would be to have a proper singleton: 

`Delayed::Worker.worker.work_off`

In the absence of a proper singleton, this will make the pattern work.
f57d0aa
@albus522 albus522 Merge pull request #773 from collectiveidea/idempotent_instantiation
Make Delayed::Worker.new idempotent
db98727
Commits on Feb 05, 2015
@isra17 isra17 Set quiet from the environment e8afa66
@isra17 isra17 Set quiet from the environment 511ab0c
Commits on Feb 13, 2015
@bethesque bethesque Merge branch 'master' of github.com:collectiveidea/delayed_job into c…
…ommand_without_rails

Conflicts:
	lib/delayed/command.rb
	spec/delayed/command_spec.rb
5da2c59
@bethesque bethesque Check for existance of Rails.root and Rails.logger separately.
@betesh pointed out that one may be defined without the other, and the existance of
both cannot be implied from the existance of the Rails module.
93e9c36
@bethesque bethesque Making Rubocop happy ae0a4a9
@bethesque bethesque Making Rubocop happy about extending Struct.new
What's so wrong about that anyway????
fec3706
@bethesque bethesque Stubbed the calls to set the logger on Delayed::Worker module.
The class variable was leaking into other tests.
bc04b96
Commits on Feb 15, 2015
@sferik sferik Merge pull request #634 from bethesque/command_without_rails
Altered Delayed::Command to work with or without Rails
6ade20c
Commits on Feb 24, 2015
@edgibbs edgibbs Merge branch 'master' into allow_per_job_destroy_on_failed
Conflicts:
	lib/delayed/worker.rb
0d44f56
@edgibbs edgibbs Remove refactor to define a DEFAULT_DESTROY_FAILED_JOBS 555ad4a
@edgibbs edgibbs Fix typo in README c00e5fd
Commits on Feb 25, 2015
@edgibbs edgibbs Refactor to destroy_failed_jobs? and move more responsibility to payl…
…oad.
2b6b0e2
Commits on Mar 06, 2015
@albus522 albus522 Merge pull request #770 from edgibbs/allow_per_job_destroy_on_failed
Add ability to set destroy failed jobs on a per job basis
35408c1
Commits on Mar 11, 2015
@kronn kronn Only execute the dj-command if cd is successful
if the directory is not present, executing the 
delayed_job_command will fail or do the wrong thing.
dd984b5
Commits on Apr 02, 2015
@albus522 albus522 Merge pull request #777 from isra17/quiet-env
Set quiet from the environment
f697f4a
@albus522 albus522 Merge pull request #731 from isra17/master
Assign the error object to the job on failure
e0ce284
@albus522 albus522 We just need a reader here 1c4af26
@albus522 albus522 Merge pull request #791 from kronn/patch-1
Only execute the dj-command if cd is successful
fa5750b
@albus522 albus522 Merge pull request #768 from derwiki/master
Add more information to Rails 4 in README
443a020
@albus522 albus522 Merge pull request #760 from cluesque/per_job_pull_request
Allow delay_jobs configuration to be a proc
7ff0987
@albus522 albus522 Cleanup proc version of Delayed::Worker.delay_jobs ce88693