Merge pull request rails#21008 from svenwin/patch-1

senny · senny · commit 7c03190344e4 · 2015-08-01T12:19:09.000+02:00
Add documentation to get a running custom base controller [ci skip]
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
@@ -183,7 +183,7 @@ class Base < Metal
     # Shortcut helper that returns all the modules included in
     # ActionController::Base except the ones passed as arguments:
     #
-    #   class MetalController
+    #   class MyBaseController < ActionController::Metal
     #     ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do |left|
     #       include left
     #     end

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,7 @@ class Base < Metal`
`183`	`183`	`# Shortcut helper that returns all the modules included in`
`184`	`184`	`# ActionController::Base except the ones passed as arguments:`
`185`	`185`	`#`
`186`		`- # class MetalController`
	`186`	`+ # class MyBaseController < ActionController::Metal`
`187`	`187`	`# ActionController::Base.without_modules(:ParamsWrapper, :Streaming).each do \|left\|`
`188`	`188`	`# include left`
`189`	`189`	`# end`