aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-12-18 12:37:08 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2015-12-18 12:37:08 +0100
commit49f2f0988ba5de7bf51602a1efeadc168dbbf58d (patch)
tree6bb5c90dd71384f40630548ebaeb8ef91fd037c2 /actioncable/lib
parente50ea481dd4ee2e82e947835dff849f28130c2c2 (diff)
parentebad5c72d3e55b855a552bb6d86e7b44330faab4 (diff)
downloadrails-49f2f0988ba5de7bf51602a1efeadc168dbbf58d.tar.gz
rails-49f2f0988ba5de7bf51602a1efeadc168dbbf58d.tar.bz2
rails-49f2f0988ba5de7bf51602a1efeadc168dbbf58d.zip
Merge pull request #22656 from akshay-vishnoi/fix-typos
[ci skip] Fix grammar
Diffstat (limited to 'actioncable/lib')
-rw-r--r--actioncable/lib/action_cable/server/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/server/base.rb b/actioncable/lib/action_cable/server/base.rb
index 5f44bdd1c3..740e4b301e 100644
--- a/actioncable/lib/action_cable/server/base.rb
+++ b/actioncable/lib/action_cable/server/base.rb
@@ -42,7 +42,7 @@ module ActionCable
@worker_pool ||= ActionCable::Server::Worker.pool(size: config.worker_pool_size)
end
- # Requires and returns an hash of all the channel class constants keyed by name.
+ # Requires and returns a hash of all the channel class constants keyed by name.
def channel_classes
@channel_classes ||= begin
config.channel_paths.each { |channel_path| require channel_path }
diff --git a/actioncable/lib/action_cable/server/broadcasting.rb b/actioncable/lib/action_cable/server/broadcasting.rb
index 6e0fbae387..c759239a0e 100644
--- a/actioncable/lib/action_cable/server/broadcasting.rb
+++ b/actioncable/lib/action_cable/server/broadcasting.rb
@@ -15,7 +15,7 @@ module ActionCable
# ActionCable.server.broadcast \
# "web_notifications_1", { title: 'New things!', body: 'All shit fit for print' }
#
- # # Client-side coffescript which assumes you've already requested the right to send web notifications
+ # # Client-side coffescript, which assumes you've already requested the right to send web notifications
# App.cable.subscriptions.create "WebNotificationsChannel",
# received: (data) ->
# new Notification data['title'], body: data['body']