diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-13 05:09:04 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-13 05:09:04 -0700 |
| commit | 0e502e08f3654925be48fbcf7ad40e07606ea1a8 (patch) | |
| tree | 86e6565740b045ca55058e8102f35fa262bc29a8 | |
| parent | ce72c0c784c877cc609936643d71c52724582188 (diff) | |
| parent | 829e3797002c960fdd4fb0f94455dcd728a3d606 (diff) | |
| download | rails-0e502e08f3654925be48fbcf7ad40e07606ea1a8.tar.gz rails-0e502e08f3654925be48fbcf7ad40e07606ea1a8.tar.bz2 rails-0e502e08f3654925be48fbcf7ad40e07606ea1a8.zip | |
Merge pull request #5407 from homakov/patch-1
'module' is reserved word. Sample of code with error - not cool.
| -rw-r--r-- | actionpack/lib/action_controller/base.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index 95de595f4f..6ce78f34b5 100644 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -174,8 +174,8 @@ module ActionController # 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 # |