aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRyuta Kamizono <kamipo@gmail.com>2019-07-19 14:59:06 +0900
committerGitHub <noreply@github.com>2019-07-19 14:59:06 +0900
commitd3b951f326c4facd693d5e3f92cc40ccdbf6dc1b (patch)
tree551520c84dc3e1644f0548508d8c54979be8eca8
parent027085a5972a798cfea60f829a9edabbd67a2818 (diff)
parent438af5507cb8be5af3db5e2c1cc012767011ecff (diff)
downloadrails-d3b951f326c4facd693d5e3f92cc40ccdbf6dc1b.tar.gz
rails-d3b951f326c4facd693d5e3f92cc40ccdbf6dc1b.tar.bz2
rails-d3b951f326c4facd693d5e3f92cc40ccdbf6dc1b.zip
Merge pull request #36710 from ypresto/patch-1
[ActionController] Fix send_file example for 404 [ci skip]
-rw-r--r--actionpack/lib/action_controller/metal/data_streaming.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/data_streaming.rb b/actionpack/lib/action_controller/metal/data_streaming.rb
index 9ef4f50df1..879745a895 100644
--- a/actionpack/lib/action_controller/metal/data_streaming.rb
+++ b/actionpack/lib/action_controller/metal/data_streaming.rb
@@ -53,7 +53,7 @@ module ActionController #:nodoc:
#
# Show a 404 page in the browser:
#
- # send_file '/path/to/404.html', type: 'text/html; charset=utf-8', status: 404
+ # send_file '/path/to/404.html', type: 'text/html; charset=utf-8', disposition: 'inline', status: 404
#
# Read about the other Content-* HTTP headers if you'd like to
# provide the user with more information (such as Content-Description) in