aboutsummaryrefslogtreecommitdiffstats
path: root/activejob/lib/rails
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/rails
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/rails')
-rw-r--r--activejob/lib/rails/generators/job/job_generator.rb (renamed from activejob/lib/rails/generators/active_job/job_generator.rb)4
-rw-r--r--activejob/lib/rails/generators/job/templates/job.rb (renamed from activejob/lib/rails/generators/active_job/templates/job.rb)0
2 files changed, 2 insertions, 2 deletions
diff --git a/activejob/lib/rails/generators/active_job/job_generator.rb b/activejob/lib/rails/generators/job/job_generator.rb
index fe4af0d2cc..78a9c27606 100644
--- a/activejob/lib/rails/generators/active_job/job_generator.rb
+++ b/activejob/lib/rails/generators/job/job_generator.rb
@@ -1,6 +1,6 @@
require 'rails/generators/named_base'
-module ActiveJob
+module Rails
module Generators # :nodoc:
class JobGenerator < Rails::Generators::NamedBase # :nodoc:
desc 'This generator creates an active job file at app/jobs'
@@ -19,4 +19,4 @@ module ActiveJob
end
end
-end \ No newline at end of file
+end
diff --git a/activejob/lib/rails/generators/active_job/templates/job.rb b/activejob/lib/rails/generators/job/templates/job.rb
index 6a21616d30..6a21616d30 100644
--- a/activejob/lib/rails/generators/active_job/templates/job.rb
+++ b/activejob/lib/rails/generators/job/templates/job.rb