aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2017-06-04 16:12:40 +0200
committerGitHub <noreply@github.com>2017-06-04 16:12:40 +0200
commit704209b017277f3404dacded2b0bb5c6d81aeb6d (patch)
tree13588b7d79a1986b3429aa5a671f80418515fecb /actionpack/lib/action_controller
parent51abe8fe6ea997ad879eb5a19842144047268117 (diff)
parentb6b0c99ff3e8ace3f42813154dbe4b8ad6a98e6c (diff)
downloadrails-704209b017277f3404dacded2b0bb5c6d81aeb6d.tar.gz
rails-704209b017277f3404dacded2b0bb5c6d81aeb6d.tar.bz2
rails-704209b017277f3404dacded2b0bb5c6d81aeb6d.zip
Merge pull request #29294 from gsamokovarov/attributes-default
Introduce mattr_accessor default option
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb6
1 files changed, 2 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index 20330b5091..cd99e3125f 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -119,8 +119,7 @@ module ActionController
# params[:key] # => "value"
# params["key"] # => "value"
class Parameters
- cattr_accessor :permit_all_parameters, instance_accessor: false
- self.permit_all_parameters = false
+ cattr_accessor :permit_all_parameters, instance_accessor: false, default: false
cattr_accessor :action_on_unpermitted_parameters, instance_accessor: false
@@ -205,8 +204,7 @@ module ActionController
# config. For instance:
#
# config.always_permitted_parameters = %w( controller action format )
- cattr_accessor :always_permitted_parameters
- self.always_permitted_parameters = %w( controller action )
+ cattr_accessor :always_permitted_parameters, default: %w( controller action )
# Returns a new instance of <tt>ActionController::Parameters</tt>.
# Also, sets the +permitted+ attribute to the default value of