diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-23 22:43:08 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-05-23 22:43:08 +0530 |
| commit | 1ad0b378cc081937c117577ab628f2160fcc448d (patch) | |
| tree | a675d20ea606caa653010c57b90d10f173f7dd93 /actionpack/lib/action_dispatch/http | |
| parent | 2642c2961cda2074cc1495a4635898ca8ab33adf (diff) | |
| download | rails-1ad0b378cc081937c117577ab628f2160fcc448d.tar.gz rails-1ad0b378cc081937c117577ab628f2160fcc448d.tar.bz2 rails-1ad0b378cc081937c117577ab628f2160fcc448d.zip | |
Revert "Remove blank trailing comments"
This reverts commit fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.
Reason: Not a fan of such massive changes. We usually close such changes
if made to Rails master as a pull request. Following the same principle
here and reverting.
[ci skip]
Diffstat (limited to 'actionpack/lib/action_dispatch/http')
| -rw-r--r-- | actionpack/lib/action_dispatch/http/mime_negotiation.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb index ca40ab9502..e31f3b823d 100644 --- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb +++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb @@ -46,6 +46,7 @@ module ActionDispatch # GET /posts/5.xml | request.format => Mime::XML # GET /posts/5.xhtml | request.format => Mime::HTML # GET /posts/5 | request.format => Mime::HTML or MIME::JS, or request.accepts.first + # def format(view_path = []) formats.first end @@ -81,6 +82,7 @@ module ActionDispatch # Receives an array of mimes and return the first user sent mime that # matches the order array. + # def negotiate_mime(order) formats.each do |priority| if priority == Mime::ALL |