Merge pull request rails#5407 from homakov/patch-1

spastorino · spastorino · commit 0e502e08f365 · 2012-03-13T05:09:04.000-07:00
'module' is reserved word. Sample of code with error - not cool.
diff --git a/actionpack/lib/action_controller/base.rb b/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
     #

Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,8 @@ class Base < Metal`
`174`	`174`	`# Shortcut helper that returns all the ActionController modules except the ones passed in the argument:`
`175`	`175`	`#`
`176`	`176`	`# class MetalController`
`177`		`- # ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do \|module\|`
`178`		`- # include module`
	`177`	`+ # ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do \|left\|`
	`178`	`+ # include left`
`179`	`179`	`# end`
`180`	`180`	`# end`
`181`	`181`	`#`