aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/metal/mime_responds.rb
diff options
context:
space:
mode:
authorJo Liss <joliss42@gmail.com>2011-04-08 20:56:38 +0200
committerJo Liss <joliss42@gmail.com>2011-04-10 11:47:22 +0200
commitc59456a1d92892cd98c34f348e16c4de6af92306 (patch)
tree9168fdb87cd5ebf48e14cc6c08166818da8f8dc0 /actionpack/lib/action_controller/metal/mime_responds.rb
parente836fc1bd2f3df0b8b0a2ef5deb182bcf1f0f3c2 (diff)
downloadrails-c59456a1d92892cd98c34f348e16c4de6af92306.tar.gz
rails-c59456a1d92892cd98c34f348e16c4de6af92306.tar.bz2
rails-c59456a1d92892cd98c34f348e16c4de6af92306.zip
removed :nodoc: from ActionController::MimeResponds
So we don't miss out on the nice documentation of the respond_to and respond_with instance methods. Also added :nodoc: to protected method.
Diffstat (limited to 'actionpack/lib/action_controller/metal/mime_responds.rb')
-rw-r--r--actionpack/lib/action_controller/metal/mime_responds.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/metal/mime_responds.rb b/actionpack/lib/action_controller/metal/mime_responds.rb
index 6469e24d36..0f6bc10dd5 100644
--- a/actionpack/lib/action_controller/metal/mime_responds.rb
+++ b/actionpack/lib/action_controller/metal/mime_responds.rb
@@ -2,7 +2,7 @@ require 'abstract_controller/collector'
require 'active_support/core_ext/class/attribute'
module ActionController #:nodoc:
- module MimeResponds #:nodoc:
+ module MimeResponds
extend ActiveSupport::Concern
included do
@@ -260,7 +260,7 @@ module ActionController #:nodoc:
# Collects mimes and return the response for the negotiated format. Returns
# nil if :not_acceptable was sent to the client.
#
- def retrieve_response_from_mimes(mimes=nil, &block)
+ def retrieve_response_from_mimes(mimes=nil, &block) #:nodoc:
mimes ||= collect_mimes_from_class_level
collector = Collector.new(mimes) { |options| default_render(options || {}) }
block.call(collector) if block_given?