diff options
Diffstat (limited to 'actionpack/lib/action_controller/base')
| -rw-r--r-- | actionpack/lib/action_controller/base/base.rb | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/base/metal.rb (renamed from actionpack/lib/action_controller/base/http.rb) | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/base/base.rb b/actionpack/lib/action_controller/base/base.rb index e541d24e31..9d9f735e27 100644 --- a/actionpack/lib/action_controller/base/base.rb +++ b/actionpack/lib/action_controller/base/base.rb @@ -1,5 +1,5 @@ module ActionController - class Base < Http + class Base < Metal abstract! include AbstractController::Benchmarker diff --git a/actionpack/lib/action_controller/base/http.rb b/actionpack/lib/action_controller/base/metal.rb index 3efd1b656f..e7d776b63e 100644 --- a/actionpack/lib/action_controller/base/http.rb +++ b/actionpack/lib/action_controller/base/metal.rb @@ -1,13 +1,13 @@ require 'action_controller/abstract' module ActionController - # ActionController::Http provides a way to get a valid Rack application from a controller. + # ActionController::Metal provides a way to get a valid Rack application from a controller. # # In AbstractController, dispatching is triggered directly by calling #process on a new controller. - # ActionController::Http provides an #action method that returns a valid Rack application for a + # ActionController::Metal provides an #action method that returns a valid Rack application for a # given action. Other rack builders, such as Rack::Builder, Rack::URLMap, and the Rails router, # can dispatch directly to the action returned by FooController.action(:index). - class Http < AbstractController::Base + class Metal < AbstractController::Base abstract! # :api: public |