diff options
| author | Xavier Noria <fxn@hashref.com> | 2011-04-12 22:45:33 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2011-04-12 22:45:33 +0200 |
| commit | 3366479a9a6db3101ffe3827a86be0e5b50f7a5a (patch) | |
| tree | a9b4e813f32a99fa626152947862bb57edd23ed0 /actionpack/lib/action_controller/metal | |
| parent | b53ffb35e085362bb2690577ae123a1f4872c12a (diff) | |
| parent | 40d156955c82c19b14494c1bf60ad48980e29a4e (diff) | |
| download | rails-3366479a9a6db3101ffe3827a86be0e5b50f7a5a.tar.gz rails-3366479a9a6db3101ffe3827a86be0e5b50f7a5a.tar.bz2 rails-3366479a9a6db3101ffe3827a86be0e5b50f7a5a.zip | |
Merge branch 'master' of git://github.com/lifo/docrails
Diffstat (limited to 'actionpack/lib/action_controller/metal')
| -rw-r--r-- | actionpack/lib/action_controller/metal/mime_responds.rb | 4 |
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 9885110d5d..618a6cdb7d 100644 --- a/actionpack/lib/action_controller/metal/mime_responds.rb +++ b/actionpack/lib/action_controller/metal/mime_responds.rb @@ -3,7 +3,7 @@ require 'active_support/core_ext/class/attribute' require 'active_support/core_ext/object/inclusion' module ActionController #:nodoc: - module MimeResponds #:nodoc: + module MimeResponds extend ActiveSupport::Concern included do @@ -261,7 +261,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? |