aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/upgrading_ruby_on_rails.md
diff options
context:
space:
mode:
authorRobin Dupret <robin.dupret@gmail.com>2015-04-05 15:55:18 +0200
committerRobin Dupret <robin.dupret@gmail.com>2015-04-05 15:58:43 +0200
commit9cc41c36f7643e6d928075e32b660de69b31a86a (patch)
tree384777a4341100d64c54e9ff6e4bd9672a3e39ae /guides/source/upgrading_ruby_on_rails.md
parent0eab204c0ec76903fa4b43aecae502f51d5a9c55 (diff)
downloadrails-9cc41c36f7643e6d928075e32b660de69b31a86a.tar.gz
rails-9cc41c36f7643e6d928075e32b660de69b31a86a.tar.bz2
rails-9cc41c36f7643e6d928075e32b660de69b31a86a.zip
Fix a few typos [ci skip]
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
-rw-r--r--guides/source/upgrading_ruby_on_rails.md12
1 files changed, 7 insertions, 5 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 5a6f267360..7666601bd7 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -77,18 +77,20 @@ See [#17227](https://github.com/rails/rails/pull/17227) for more details.
### ActiveJob jobs now inherent from ApplicationJob by default
-In Rails 4.2 an ActiveJob inherents from `ActiveJob::Base`. In Rails 5.0 this
-behaviour has changed to now inherent from `ApplicationJob`.
+In Rails 4.2 an ActiveJob inherits from `ActiveJob::Base`. In Rails 5.0 this
+behavior has changed to now inherit from `ApplicationJob`.
-When upgrading from Rails 4.2 to Rails 5.0 you need to create a file
-`application_job.rb` in `app/jobs/` and add the following content:
+When upgrading from Rails 4.2 to Rails 5.0 you need to create an
+`application_job.rb` file in `app/jobs/` and add the following content:
```
class ApplicationJob < ActiveJob::Base
end
```
-See [#19034](https://github.com/rails/rails/pull/19034) for more details
+Then make sure that all your job classes inherit from it.
+
+See [#19034](https://github.com/rails/rails/pull/19034) for more details.
Upgrading from Rails 4.1 to Rails 4.2
-------------------------------------