diff options
author | Andrew White <pixeltrix@users.noreply.github.com> | 2016-11-13 14:09:30 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-11-13 14:09:30 +0000 |
commit | 0ef5b6c1630847c56a7a7ffe96045b72b23cd376 (patch) | |
tree | 43411c3bef670e73c4f85e71cf5f6e1b8bb48875 /actionpack/lib/action_controller | |
parent | d07d1e596674e8a6b20a8a5751b86ddd8d3fa630 (diff) | |
parent | 5faa9a235c46037a3b8e4f3308fd7ccadaae8039 (diff) | |
download | rails-0ef5b6c1630847c56a7a7ffe96045b72b23cd376.tar.gz rails-0ef5b6c1630847c56a7a7ffe96045b72b23cd376.tar.bz2 rails-0ef5b6c1630847c56a7a7ffe96045b72b23cd376.zip |
Merge pull request #26905 from bogdanvlviv/docs
Add missing `+` around a some literals.
Diffstat (limited to 'actionpack/lib/action_controller')
-rw-r--r-- | actionpack/lib/action_controller/metal/etag_with_template_digest.rb | 2 | ||||
-rw-r--r-- | actionpack/lib/action_controller/metal/strong_parameters.rb | 2 |
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 49c9dc90f1..e14da22e01 100644 --- a/actionpack/lib/action_controller/metal/strong_parameters.rb +++ b/actionpack/lib/action_controller/metal/strong_parameters.rb @@ -549,7 +549,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 |