diff options
| author | David Heinemeier Hansson <david@basecamp.com> | 2014-08-17 16:44:30 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@basecamp.com> | 2014-08-17 16:44:30 -0700 |
| commit | 49c9f850fa3e2484e3aaf20b2479f61b1cc9375e (patch) | |
| tree | 2f2750a0801c0f2450f6908639973c38d9625963 /railties/lib/rails | |
| parent | b2708a635285f2b09040ee9070a8f5a09ab22282 (diff) | |
| parent | 080296be61105f4f941441a506a6a9fe5c562772 (diff) | |
| download | rails-49c9f850fa3e2484e3aaf20b2479f61b1cc9375e.tar.gz rails-49c9f850fa3e2484e3aaf20b2479f61b1cc9375e.tar.bz2 rails-49c9f850fa3e2484e3aaf20b2479f61b1cc9375e.zip | |
Merge pull request #16485 from seuros/activejob
Integrate ActiveJob / DeliverLater / GlobalID with Rails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/all.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/api/task.rb | 7 |
2 files changed, 8 insertions, 0 deletions
diff --git a/railties/lib/rails/all.rb b/railties/lib/rails/all.rb index 2e83c0fe14..45361fca83 100644 --- a/railties/lib/rails/all.rb +++ b/railties/lib/rails/all.rb @@ -5,6 +5,7 @@ require "rails" action_controller action_view action_mailer + active_job rails/test_unit sprockets ).each do |framework| diff --git a/railties/lib/rails/api/task.rb b/railties/lib/rails/api/task.rb index 3e32576040..4d49244807 100644 --- a/railties/lib/rails/api/task.rb +++ b/railties/lib/rails/api/task.rb @@ -50,6 +50,13 @@ module Rails ) }, + 'activejob' => { + :include => %w( + README.md + lib/active_job/**/*.rb + ) + }, + 'railties' => { :include => %w( README.rdoc |