aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal
diff options
context:
space:
mode:
authorbogdanvlviv <bogdanvlviv@gmail.com>2016-10-27 00:13:15 +0300
committerbogdanvlviv <bogdanvlviv@gmail.com>2016-10-27 00:27:47 +0300
commit5faa9a235c46037a3b8e4f3308fd7ccadaae8039 (patch)
treeea89b18ff5cca42117dafa96c8772cc6e00d2227 /actionpack/lib/action_controller/metal
parent0b4679f192a4892a6eb09bb6103d967408cfdc83 (diff)
downloadrails-5faa9a235c46037a3b8e4f3308fd7ccadaae8039.tar.gz
rails-5faa9a235c46037a3b8e4f3308fd7ccadaae8039.tar.bz2
rails-5faa9a235c46037a3b8e4f3308fd7ccadaae8039.zip
Add missing `+` around a some literals.
Mainly around `nil` [ci skip]
Diffstat (limited to 'actionpack/lib/action_controller/metal')
-rw-r--r--actionpack/lib/action_controller/metal/etag_with_template_digest.rb2
-rw-r--r--actionpack/lib/action_controller/metal/strong_parameters.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
index 6c103bb042..798564db96 100644
--- a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
+++ b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb
@@ -40,7 +40,7 @@ module ActionController
end
# Pick the template digest to include in the ETag. If the +:template+ option
- # is present, use the named template. If +:template+ is nil or absent, use
+ # is present, use the named template. If +:template+ is +nil+ or absent, use
# the default controller/action template. If +:template+ is false, omit the
# template digest from the ETag.
def pick_template_for_etag(options)
diff --git a/actionpack/lib/action_controller/metal/strong_parameters.rb b/actionpack/lib/action_controller/metal/strong_parameters.rb
index b64617d084..eb5fc87072 100644
--- a/actionpack/lib/action_controller/metal/strong_parameters.rb
+++ b/actionpack/lib/action_controller/metal/strong_parameters.rb
@@ -539,7 +539,7 @@ module ActionController
new_instance_with_inherited_permitted_status(@parameters.select(&block))
end
- # Equivalent to Hash#keep_if, but returns nil if no changes were made.
+ # Equivalent to Hash#keep_if, but returns +nil+ if no changes were made.
def select!(&block)
@parameters.select!(&block)
self