diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2017-06-04 16:12:40 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-04 16:12:40 +0200 |
| commit | 704209b017277f3404dacded2b0bb5c6d81aeb6d (patch) | |
| tree | 13588b7d79a1986b3429aa5a671f80418515fecb /actionpack/lib/action_dispatch/middleware | |
| parent | 51abe8fe6ea997ad879eb5a19842144047268117 (diff) | |
| parent | b6b0c99ff3e8ace3f42813154dbe4b8ad6a98e6c (diff) | |
| download | rails-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_dispatch/middleware')
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/cookies.rb | 3 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/middleware/exception_wrapper.rb | 8 |
2 files changed, 3 insertions, 8 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/cookies.rb b/actionpack/lib/action_dispatch/middleware/cookies.rb index c0dda1bba5..6e7a68cdf8 100644 --- a/actionpack/lib/action_dispatch/middleware/cookies.rb +++ b/actionpack/lib/action_dispatch/middleware/cookies.rb @@ -432,8 +432,7 @@ module ActionDispatch end end - mattr_accessor :always_write_cookie - self.always_write_cookie = false + mattr_accessor :always_write_cookie, default: false private diff --git a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb index 397f0a8b92..08b4541d24 100644 --- a/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb +++ b/actionpack/lib/action_dispatch/middleware/exception_wrapper.rb @@ -3,9 +3,7 @@ require "rack/utils" module ActionDispatch class ExceptionWrapper - cattr_accessor :rescue_responses - @@rescue_responses = Hash.new(:internal_server_error) - @@rescue_responses.merge!( + cattr_accessor :rescue_responses, default: Hash.new(:internal_server_error).merge!( "ActionController::RoutingError" => :not_found, "AbstractController::ActionNotFound" => :not_found, "ActionController::MethodNotAllowed" => :method_not_allowed, @@ -21,9 +19,7 @@ module ActionDispatch "Rack::QueryParser::InvalidParameterError" => :bad_request ) - cattr_accessor :rescue_templates - @@rescue_templates = Hash.new("diagnostics") - @@rescue_templates.merge!( + cattr_accessor :rescue_templates, default: Hash.new("diagnostics").merge!( "ActionView::MissingTemplate" => "missing_template", "ActionController::RoutingError" => "routing_error", "AbstractController::ActionNotFound" => "unknown_action", |