diff options
author | eileencodes <eileencodes@gmail.com> | 2019-03-13 13:11:10 -0400 |
---|---|---|
committer | eileencodes <eileencodes@gmail.com> | 2019-03-13 13:11:10 -0400 |
commit | a2bd669ed240bec739074188d61ff125e07fa8d1 (patch) | |
tree | f16681562c906e3a8881d010e252b0a3a1dfe5ae /actionpack/lib/action_dispatch/http/mime_negotiation.rb | |
parent | 1dc4d49f517e5cea99063afd9692b201199484ef (diff) | |
parent | 7c87fd5635fd830905e17d3cbf1eb2a2215acedf (diff) | |
download | rails-a2bd669ed240bec739074188d61ff125e07fa8d1.tar.gz rails-a2bd669ed240bec739074188d61ff125e07fa8d1.tar.bz2 rails-a2bd669ed240bec739074188d61ff125e07fa8d1.zip |
Merge tag 'v6.0.0.beta3'
v6.0.0.beta3 release
Diffstat (limited to 'actionpack/lib/action_dispatch/http/mime_negotiation.rb')
-rw-r--r-- | actionpack/lib/action_dispatch/http/mime_negotiation.rb | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb index 498b1e6695..4e81ba12a5 100644 --- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb +++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb @@ -79,6 +79,11 @@ module ActionDispatch else [Mime[:html]] end + + v = v.select do |format| + format.symbol || format.ref == "*/*" + end + set_header k, v end end |