aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/http/mime_negotiation.rb
diff options
context:
space:
mode:
authorHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
committerHenrik Hodne <dvyjones@dvyjones.com>2012-05-20 01:29:13 +0200
commitfa6d921e11363e9b8c4bc10f7aed0b9faffdc33a (patch)
tree1e4fd51d0d58cb5b5f210eeb6842ca3ada999243 /actionpack/lib/action_dispatch/http/mime_negotiation.rb
parent7eb09aed874dbb5f50a9ac0d0dec22e42f6161be (diff)
downloadrails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.gz
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.tar.bz2
rails-fa6d921e11363e9b8c4bc10f7aed0b9faffdc33a.zip
Remove blank trailing comments
For future reference, this is the regex I used: ^\s*#\s*\n(?!\s*#). Replace with the first match, and voilĂ ! Note that the regex matches a little bit too much, so you probably want to `git add -i .` and go through every single diff to check if it actually should be changed.
Diffstat (limited to 'actionpack/lib/action_dispatch/http/mime_negotiation.rb')
-rw-r--r--actionpack/lib/action_dispatch/http/mime_negotiation.rb2
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/http/mime_negotiation.rb b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
index e31f3b823d..ca40ab9502 100644
--- a/actionpack/lib/action_dispatch/http/mime_negotiation.rb
+++ b/actionpack/lib/action_dispatch/http/mime_negotiation.rb
@@ -46,7 +46,6 @@ 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
@@ -82,7 +81,6 @@ 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