aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib/active_job/railtie.rb
diff options
context:
space:
mode:
authorCristian Bica <cristian.bica@gmail.com>2014-08-12 13:53:46 +0300
committerCristian Bica <cristian.bica@gmail.com>2014-08-12 13:53:46 +0300
commit3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5 (patch)
treeae592fe3a17ea77536a8b1ab2ddbbefa45dbd2c1 /activejob/lib/active_job/railtie.rb
parent0c232779ece1ff6bf9bce9d55c54ea19867a2170 (diff)
downloadrails-3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5.tar.gz
rails-3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5.tar.bz2
rails-3ed69cd5f54c6eda7ee8664aa14c53205ecbb6c5.zip
Fixed failing tests; Load active_job in railtie; Renamed generator to job
Diffstat (limited to 'activejob/lib/active_job/railtie.rb')
-rw-r--r--activejob/lib/active_job/railtie.rb5
1 files changed, 3 insertions, 2 deletions
diff --git a/activejob/lib/active_job/railtie.rb b/activejob/lib/active_job/railtie.rb
index 08555d1d77..16736374af 100644
--- a/activejob/lib/active_job/railtie.rb
+++ b/activejob/lib/active_job/railtie.rb
@@ -1,4 +1,5 @@
-require 'active_model/railtie'
+require 'active_job'
+require 'rails'
module ActiveJob
# = Active Job Railtie
@@ -7,4 +8,4 @@ module ActiveJob
ActiveSupport.on_load(:active_job) { self.logger = ::Rails.logger }
end
end
-end \ No newline at end of file
+end