aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-10-03 12:57:09 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-10-03 12:57:09 +0200
commit1b00c36d8535e88ffcc6e4401f3c91acd6138ba3 (patch)
tree07ecd8d64857baa8c932d718a226e761d0ba50ab
parent37423e4ff883ad5584bab983aceb4b2b759a1fd8 (diff)
parent70b09eda034766efcd2cac9280d42c7bbaaadff9 (diff)
downloadrails-1b00c36d8535e88ffcc6e4401f3c91acd6138ba3.tar.gz
rails-1b00c36d8535e88ffcc6e4401f3c91acd6138ba3.tar.bz2
rails-1b00c36d8535e88ffcc6e4401f3c91acd6138ba3.zip
Merge pull request #21851 from y-yagi/use_class_to_specify_middleware
use class to specify the middleware [ci skip]
-rw-r--r--guides/source/rails_on_rack.md10
-rw-r--r--railties/lib/rails/generators/rails/app/templates/config/initializers/cors.rb2
2 files changed, 6 insertions, 6 deletions
diff --git a/guides/source/rails_on_rack.md b/guides/source/rails_on_rack.md
index 82aedc3fdf..1479e6f263 100644
--- a/guides/source/rails_on_rack.md
+++ b/guides/source/rails_on_rack.md
@@ -170,7 +170,7 @@ Add the following lines to your application configuration:
```ruby
# config/application.rb
-config.middleware.delete "Rack::Lock"
+config.middleware.delete Rack::Lock
```
And now if you inspect the middleware stack, you'll find that `Rack::Lock` is
@@ -190,16 +190,16 @@ If you want to remove session related middleware, do the following:
```ruby
# config/application.rb
-config.middleware.delete "ActionDispatch::Cookies"
-config.middleware.delete "ActionDispatch::Session::CookieStore"
-config.middleware.delete "ActionDispatch::Flash"
+config.middleware.delete ActionDispatch::Cookies
+config.middleware.delete ActionDispatch::Session::CookieStore
+config.middleware.delete ActionDispatch::Flash
```
And to remove browser related middleware,
```ruby
# config/application.rb
-config.middleware.delete "Rack::MethodOverride"
+config.middleware.delete Rack::MethodOverride
```
### Internal Middleware Stack
diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/cors.rb b/railties/lib/rails/generators/rails/app/templates/config/initializers/cors.rb
index 45c44d24f8..9fca213a04 100644
--- a/railties/lib/rails/generators/rails/app/templates/config/initializers/cors.rb
+++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/cors.rb
@@ -3,7 +3,7 @@
# Read more: https://github.com/cyu/rack-cors
-# Rails.application.config.middleware.insert_before 0, "Rack::Cors" do
+# Rails.application.config.middleware.insert_before 0, Rack::Cors do
# allow do
# origins 'example.com'
#