aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib
diff options
context:
space:
mode:
authorJon Moss <maclover7@users.noreply.github.com>2016-02-13 09:39:34 -0500
committerJon Moss <maclover7@users.noreply.github.com>2016-02-13 09:39:34 -0500
commit4e80c12de3058eafd6c4f209bc78d9e3f6e26a0f (patch)
tree8a6067dade5901889c72d35c2679be56595851f2 /actioncable/lib
parent3974edb9ceff244e813358483a036d12578f7cca (diff)
parent1335959135b908c284e4d7179e9d8c1261f0ee95 (diff)
downloadrails-4e80c12de3058eafd6c4f209bc78d9e3f6e26a0f.tar.gz
rails-4e80c12de3058eafd6c4f209bc78d9e3f6e26a0f.tar.bz2
rails-4e80c12de3058eafd6c4f209bc78d9e3f6e26a0f.zip
Merge pull request #23654 from kamipo/fix_grammar_a_to_an
Fix grammar `a` to `an` [ci skip]
Diffstat (limited to 'actioncable/lib')
-rw-r--r--actioncable/lib/action_cable/connection/base.rb2
-rw-r--r--actioncable/lib/action_cable/server/broadcasting.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/connection/base.rb b/actioncable/lib/action_cable/connection/base.rb
index e23789978c..1acef93025 100644
--- a/actioncable/lib/action_cable/connection/base.rb
+++ b/actioncable/lib/action_cable/connection/base.rb
@@ -35,7 +35,7 @@ module ActionCable
#
# First, we declare that this connection can be identified by its current_user. This allows us later to be able to find all connections
# established for that current_user (and potentially disconnect them if the user was removed from an account). You can declare as many
- # identification indexes as you like. Declaring an identification means that a attr_accessor is automatically set for that key.
+ # identification indexes as you like. Declaring an identification means that an attr_accessor is automatically set for that key.
#
# Second, we rely on the fact that the WebSocket connection is established with the cookies from the domain being sent along. This makes
# it easy to use signed cookies that were set when logging in via a web interface to authorize the WebSocket connection.
diff --git a/actioncable/lib/action_cable/server/broadcasting.rb b/actioncable/lib/action_cable/server/broadcasting.rb
index 7e8aef45f4..b87232671b 100644
--- a/actioncable/lib/action_cable/server/broadcasting.rb
+++ b/actioncable/lib/action_cable/server/broadcasting.rb
@@ -23,7 +23,7 @@ module ActionCable
broadcaster_for(broadcasting).broadcast(message)
end
- # Returns a broadcaster for a named <tt>broadcasting</tt> that can be reused. Useful when you have a object that
+ # Returns a broadcaster for a named <tt>broadcasting</tt> that can be reused. Useful when you have an object that
# may need multiple spots to transmit to a specific broadcasting over and over.
def broadcaster_for(broadcasting)
Broadcaster.new(self, broadcasting)