aboutsummaryrefslogtreecommitdiffstats
path: root/guides/source/upgrading_ruby_on_rails.md
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2015-12-17 19:07:03 +0530
committerPrathamesh Sonpatki <csonpatki@gmail.com>2015-12-17 19:07:03 +0530
commitf800007c84d33ea82cad0f684616701893472ad8 (patch)
tree15383f56ce02297d06c4a1350911019276d146b1 /guides/source/upgrading_ruby_on_rails.md
parent7a53a9c13c997771797874b7549d389ced0be7b2 (diff)
downloadrails-f800007c84d33ea82cad0f684616701893472ad8.tar.gz
rails-f800007c84d33ea82cad0f684616701893472ad8.tar.bz2
rails-f800007c84d33ea82cad0f684616701893472ad8.zip
Fix section about ApplicationRecord in upgrading guide [ci skip]
Diffstat (limited to 'guides/source/upgrading_ruby_on_rails.md')
-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