Permalink
Browse files

Merge pull request #5407 from homakov/patch-1

'module' is reserved word. Sample of code with error - not cool.
  • Loading branch information...
2 parents ce72c0c + 829e379 commit 0e502e08f3654925be48fbcf7ad40e07606ea1a8 @spastorino spastorino committed Mar 13, 2012
Showing with 2 additions and 2 deletions.
  1. +2 −2 actionpack/lib/action_controller/base.rb
@@ -174,8 +174,8 @@ class Base < Metal
# Shortcut helper that returns all the ActionController modules except the ones passed in the argument:
#
# class MetalController
- # ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do |module|
- # include module
+ # ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do |left|
+ # include left
# end
# end
#

0 comments on commit 0e502e0

Please sign in to comment.