diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2015-08-24 13:40:03 -0300 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2015-08-24 13:40:03 -0300 |
| commit | 35decf4b6b94a84205fe8ee684e2d90a0d2b0a87 (patch) | |
| tree | 4026b02ca21bd6760ac2c37dffc7b59efa026288 | |
| parent | 9e5ba3c86b71b4fc10d60d72328a6692acee237e (diff) | |
| parent | dbfab58457c4a2c958718b8f67491965d879c69a (diff) | |
| download | rails-35decf4b6b94a84205fe8ee684e2d90a0d2b0a87.tar.gz rails-35decf4b6b94a84205fe8ee684e2d90a0d2b0a87.tar.bz2 rails-35decf4b6b94a84205fe8ee684e2d90a0d2b0a87.zip | |
Merge pull request #21339 from deepj/unused-block-arguments
Remove unused block arguments
| -rw-r--r-- | actionpack/lib/action_controller/metal/etag_with_template_digest.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_dispatch/routing/route_set.rb | 4 |
2 files changed, 3 insertions, 3 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 f9303efe6c..669cf55bca 100644 --- a/actionpack/lib/action_controller/metal/etag_with_template_digest.rb +++ b/actionpack/lib/action_controller/metal/etag_with_template_digest.rb @@ -25,7 +25,7 @@ module ActionController class_attribute :etag_with_template_digest self.etag_with_template_digest = true - ActiveSupport.on_load :action_view, yield: true do |action_view_base| + ActiveSupport.on_load :action_view, yield: true do etag do |options| determine_template_etag(options) if etag_with_template_digest end diff --git a/actionpack/lib/action_dispatch/routing/route_set.rb b/actionpack/lib/action_dispatch/routing/route_set.rb index af6f0de556..2e8c346758 100644 --- a/actionpack/lib/action_dispatch/routing/route_set.rb +++ b/actionpack/lib/action_dispatch/routing/route_set.rb @@ -171,9 +171,9 @@ module ActionDispatch private def optimized_helper(args) - params = parameterize_args(args) { |k| + params = parameterize_args(args) do raise_generation_error(args) - } + end @route.format params end |