aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael França <rafaelmfranca@gmail.com>2015-12-17 12:42:04 -0200
committerRafael França <rafaelmfranca@gmail.com>2015-12-17 12:42:04 -0200
commitffa26d65a79c26e76cde68eb55e72f3d8d2fece2 (patch)
tree57a1590f71239a2ac45fedf078a52ab549402d0f
parent7daad3a4015769f5b1c2fd7b65955a6f63d72812 (diff)
parentf800007c84d33ea82cad0f684616701893472ad8 (diff)
downloadrails-ffa26d65a79c26e76cde68eb55e72f3d8d2fece2.tar.gz
rails-ffa26d65a79c26e76cde68eb55e72f3d8d2fece2.tar.bz2
rails-ffa26d65a79c26e76cde68eb55e72f3d8d2fece2.zip
Merge pull request #22632 from prathamesh-sonpatki/fix-upgrading-guide
Fix section about ApplicationRecord in upgrading guide [ci skip]
-rw-r--r--guides/source/upgrading_ruby_on_rails.md8
1 files changed, 4 insertions, 4 deletions
diff --git a/guides/source/upgrading_ruby_on_rails.md b/guides/source/upgrading_ruby_on_rails.md
index 58fda3aa0d..148890bf77 100644
--- a/guides/source/upgrading_ruby_on_rails.md
+++ b/guides/source/upgrading_ruby_on_rails.md
@@ -55,12 +55,12 @@ Upgrading from Rails 4.2 to Rails 5.0
### Active Record models now inherit from ApplicationRecord by default
-In Rails 4.2 an Active Job inherits from `ActiveRecord::Base`. In Rails 5.0 models
-inherit from `ApplicationRecord`.
+In Rails 4.2 an Active Record model inherits from `ActiveRecord::Base`. In Rails 5.0,
+all models inherit from `ApplicationRecord`.
`ApplicationRecord` is a new superclass for all app models, analogous to app
-controllers subclassing ApplicationController instead of
-ActionController::Base. This gives apps a single spot to configure app-wide
+controllers subclassing `ApplicationController` instead of
+`ActionController::Base`. This gives apps a single spot to configure app-wide
model behavior
When upgrading from Rails 4.2 to Rails 5.0 you need to create an