1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00

Merge pull request #39442 from fatkodima/actionpack-docs-fixes

A few action_controller docs corrections [skip ci]
This commit is contained in:
Vipul A M 2020-05-27 00:44:20 +05:30 committed by GitHub
commit a970efbccc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions

View file

@ -22,7 +22,7 @@ module ActionController
# Third, if we DON'T find a template AND the request is a page load in a web # Third, if we DON'T find a template AND the request is a page load in a web
# browser (technically, a non-XHR GET request for an HTML response) where # browser (technically, a non-XHR GET request for an HTML response) where
# you reasonably expect to have rendered a template, then we raise # you reasonably expect to have rendered a template, then we raise
# <tt>ActionView::UnknownFormat</tt> with an explanation. # <tt>ActionController::MissingExactTemplate</tt> with an explanation.
# #
# Finally, if we DON'T find a template AND the request isn't a browser page # Finally, if we DON'T find a template AND the request isn't a browser page
# load, then we implicitly respond with <tt>204 No Content</tt>. # load, then we implicitly respond with <tt>204 No Content</tt>.

View file

@ -252,7 +252,7 @@ module ActionController
# to change these is to specify `always_permitted_parameters` in your # to change these is to specify `always_permitted_parameters` in your
# config. For instance: # config. For instance:
# #
# config.always_permitted_parameters = %w( controller action format ) # config.action_controller.always_permitted_parameters = %w( controller action format )
cattr_accessor :always_permitted_parameters, default: %w( controller action ) cattr_accessor :always_permitted_parameters, default: %w( controller action )
class << self class << self