aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-30 16:50:54 -0700
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-07-30 16:50:54 -0700
commit10cdeb867bb4b5534c575b0eb3f03e6719269875 (patch)
tree50455fcaa29ae29ea8114ddd5dfbc0f18c8b503e /actionpack
parentf6068f1df7a4a35cdeca3fecdca096c692b1d43b (diff)
parent829ec373dde05d834a142fc1f057195da85094b9 (diff)
downloadrails-10cdeb867bb4b5534c575b0eb3f03e6719269875.tar.gz
rails-10cdeb867bb4b5534c575b0eb3f03e6719269875.tar.bz2
rails-10cdeb867bb4b5534c575b0eb3f03e6719269875.zip
Merge pull request #7205 from frodsan/fix_nodoc_live
Fix nodoc in metal/live [ci skip]
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/lib/action_controller/metal/live.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/actionpack/lib/action_controller/metal/live.rb b/actionpack/lib/action_controller/metal/live.rb
index 260a33f45a..e6ada0c106 100644
--- a/actionpack/lib/action_controller/metal/live.rb
+++ b/actionpack/lib/action_controller/metal/live.rb
@@ -1,7 +1,7 @@
require 'action_dispatch/http/response'
require 'delegate'
-module ActionController # :nodoc:
+module ActionController
# Mix this module in to your controller, and all actions in that controller
# will be able to stream data to the client as it's written.
#
@@ -31,7 +31,7 @@ module ActionController # :nodoc:
# the main thread. Make sure your actions are thread safe, and this shouldn't
# be a problem (don't share state across threads, etc).
module Live
- class Buffer < ActionDispatch::Response::Buffer # :nodoc:
+ class Buffer < ActionDispatch::Response::Buffer #:nodoc:
def initialize(response)
super(response, Queue.new)
end
@@ -57,8 +57,8 @@ module ActionController # :nodoc:
end
end
- class Response < ActionDispatch::Response # :nodoc:
- class Header < DelegateClass(Hash) # :nodoc:
+ class Response < ActionDispatch::Response #:nodoc: all
+ class Header < DelegateClass(Hash)
def initialize(response, header)
@response = response
super(header)