diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-24 14:58:01 -0200 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2014-11-24 14:58:01 -0200 |
| commit | 48a88305876f1b73329d325d58c9eee9f10e972b (patch) | |
| tree | b32341d730c307b6ecd2e2a8534c0977dd27f8a7 | |
| parent | e3acd74fa8cbe5c09321ee75dd387e9d8cb044fc (diff) | |
| parent | 47ca6664fb51823709cc8fbcfa5cea510da18879 (diff) | |
| download | rails-48a88305876f1b73329d325d58c9eee9f10e972b.tar.gz rails-48a88305876f1b73329d325d58c9eee9f10e972b.tar.bz2 rails-48a88305876f1b73329d325d58c9eee9f10e972b.zip | |
Merge pull request #17737 from yui-knk/fix/head
Replace ActionDispatch::Head with Rack::Head.
| -rw-r--r-- | guides/source/configuring.md | 6 | ||||
| -rw-r--r-- | railties/lib/rails/configuration.rb | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/guides/source/configuring.md b/guides/source/configuring.md index 2957232186..7688962c01 100644 --- a/guides/source/configuring.md +++ b/guides/source/configuring.md @@ -214,7 +214,7 @@ Every Rails application comes with a standard set of middleware which it uses in * `ActionDispatch::Flash` sets up the `flash` keys. Only available if `config.action_controller.session_store` is set to a value. * `ActionDispatch::ParamsParser` parses out parameters from the request into `params`. * `Rack::MethodOverride` allows the method to be overridden if `params[:_method]` is set. This is the middleware which supports the PATCH, PUT, and DELETE HTTP method types. -* `ActionDispatch::Head` converts HEAD requests to GET requests and serves them as so. +* `Rack::Head` converts HEAD requests to GET requests and serves them as so. Besides these usual middleware, you can add your own by using the `config.middleware.use` method: @@ -225,13 +225,13 @@ config.middleware.use Magical::Unicorns This will put the `Magical::Unicorns` middleware on the end of the stack. You can use `insert_before` if you wish to add a middleware before another. ```ruby -config.middleware.insert_before ActionDispatch::Head, Magical::Unicorns +config.middleware.insert_before Rack::Head, Magical::Unicorns ``` There's also `insert_after` which will insert a middleware after another: ```ruby -config.middleware.insert_after ActionDispatch::Head, Magical::Unicorns +config.middleware.insert_after Rack::Head, Magical::Unicorns ``` Middlewares can also be completely swapped out and replaced with others: diff --git a/railties/lib/rails/configuration.rb b/railties/lib/rails/configuration.rb index f5d7dede66..f99cec04c5 100644 --- a/railties/lib/rails/configuration.rb +++ b/railties/lib/rails/configuration.rb @@ -18,11 +18,11 @@ module Rails # This will put the <tt>Magical::Unicorns</tt> middleware on the end of the stack. # You can use +insert_before+ if you wish to add a middleware before another: # - # config.middleware.insert_before ActionDispatch::Head, Magical::Unicorns + # config.middleware.insert_before Rack::Head, Magical::Unicorns # # There's also +insert_after+ which will insert a middleware after another: # - # config.middleware.insert_after ActionDispatch::Head, Magical::Unicorns + # config.middleware.insert_after Rack::Head, Magical::Unicorns # # Middlewares can also be completely swapped out and replaced with others: # |