diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-17 16:54:26 -0700 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2014-08-17 16:54:26 -0700 |
| commit | 5d2de5c3b8d71ae7ffd1b4193edc1b169e00cd0e (patch) | |
| tree | 959cf1f0132d89921fa1a276a2a8dc689e3c3aa0 /railties | |
| parent | c20c86ee9e944e38ce0eb581e4af3ad4af839875 (diff) | |
| parent | 49c9f850fa3e2484e3aaf20b2479f61b1cc9375e (diff) | |
| download | rails-5d2de5c3b8d71ae7ffd1b4193edc1b169e00cd0e.tar.gz rails-5d2de5c3b8d71ae7ffd1b4193edc1b169e00cd0e.tar.bz2 rails-5d2de5c3b8d71ae7ffd1b4193edc1b169e00cd0e.zip | |
Merge branch 'master' of github.com:rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/all.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/api/task.rb | 7 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/Gemfile | 2 |
3 files changed, 9 insertions, 1 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 diff --git a/railties/lib/rails/generators/rails/app/templates/Gemfile b/railties/lib/rails/generators/rails/app/templates/Gemfile index 8b51fda359..d6311829fa 100644 --- a/railties/lib/rails/generators/rails/app/templates/Gemfile +++ b/railties/lib/rails/generators/rails/app/templates/Gemfile @@ -31,7 +31,7 @@ group :development, :test do <%- end -%> # Access an IRB console on exceptions page and /console in development - gem 'web-console' + gem 'web-console', '2.0.0.beta1' <%- if spring_install? %> # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' |