aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/mime_responds.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2012-07-20 22:19:23 -0700
committerXavier Noria <fxn@hashref.com>2012-07-20 22:19:23 -0700
commitd7211488bd711b42534e93e30e65e7c274545b70 (patch)
treeb6f92ef64f46ca16cee4337318c38798dda68e3f /actionpack/lib/action_controller/metal/mime_responds.rb
parent2f6e33d3f84fe6924971291bbf9d0c345afe3f47 (diff)
parent9674d2c70f59892911d1aa9db20d72c3c0837102 (diff)
downloadrails-d7211488bd711b42534e93e30e65e7c274545b70.tar.gz
rails-d7211488bd711b42534e93e30e65e7c274545b70.tar.bz2
rails-d7211488bd711b42534e93e30e65e7c274545b70.zip
Merge pull request #7100 from shigeya/fix_mime_responds_to_doc
Clarification to doc of ActionController::MimeResponse.respond_to
Diffstat (limited to 'actionpack/lib/action_controller/metal/mime_responds.rb')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 0b800c3c62..431ee69e4c 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -182,7 +182,8 @@ module ActionController #:nodoc:
# end
# end
#
- # Be sure to check respond_with and respond_to documentation for more examples.
+ # Be sure to check respond_with and
+ # ActionController::MimeResponds.respond_to documentation for more examples.
def respond_to(*mimes, &block)
raise ArgumentError, "respond_to takes either types or a block, never both" if mimes.any? && block_given?