Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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: collectiveidea/delayed_job
...
head fork: onemedical/delayed_job
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Commits on Oct 04, 2012
Mathew Spolin Update lib/delayed/railtie.rb
ddfbd11
Mathew Spolin Update lib/delayed_job.rb
bebca54
Showing with 4 additions and 1 deletion.
  1. +3 −0  lib/delayed/railtie.rb
  2. +1 −1  lib/delayed_job.rb
View
3  lib/delayed/railtie.rb
@@ -7,6 +7,9 @@ class Railtie < Rails::Railtie
ActiveSupport.on_load(:action_mailer) do
ActionMailer::Base.send(:extend, Delayed::DelayMail)
end
+ ActiveSupport.on_load(:active_record) do
+ require 'delayed/yaml_ext'
+ end
end
rake_tasks do
View
2  lib/delayed_job.rb
@@ -8,7 +8,7 @@
require 'delayed/performable_mailer' if 3 == ActionMailer::VERSION::MAJOR
end
-require 'delayed/yaml_ext'
+require 'delayed/yaml_ext' unless defined?(Rails::Railtie)
require 'delayed/lifecycle'
require 'delayed/plugin'
require 'delayed/plugins/clear_locks'

No commit comments for this range

Something went wrong with that request. Please try again.