aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-30 07:16:32 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-08-30 07:16:32 -0700
commit66c31dd2b8b50090b48fecf8d39b706d3f4eb8c8 (patch)
tree966fc035bbb3ae6c451a65bc54af276317e51960 /actionpack/lib
parenta317e7897f38c02e84d0827cd60e10a8f59a1a95 (diff)
parentd30977c75872d6548bec3ecf63d6dc9c7c016a1c (diff)
downloadrails-66c31dd2b8b50090b48fecf8d39b706d3f4eb8c8.tar.gz
rails-66c31dd2b8b50090b48fecf8d39b706d3f4eb8c8.tar.bz2
rails-66c31dd2b8b50090b48fecf8d39b706d3f4eb8c8.zip
Merge pull request #7484 from kennyj/fix_warning_20120830
Fixes warning: & interpreted as argument prefix
Diffstat (limited to 'actionpack/lib')
-rw-r--r--actionpack/lib/action_controller/metal/conditional_get.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/conditional_get.rb b/actionpack/lib/action_controller/metal/conditional_get.rb
index 870938df8f..7521deaaca 100644
--- a/actionpack/lib/action_controller/metal/conditional_get.rb
+++ b/actionpack/lib/action_controller/metal/conditional_get.rb
@@ -166,7 +166,7 @@ module ActionController
private
def combine_etags(etag)
- [ etag, *etaggers.map { |etagger| instance_exec &etagger }.compact ]
+ [ etag, *etaggers.map { |etagger| instance_exec(&etagger) }.compact ]
end
end
end