aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-03-22 20:03:56 +0100
committerKasper Timm Hansen <kaspth@gmail.com>2016-03-22 20:03:56 +0100
commit8857e0604907969550cc6fbba29fd4d78928f9cd (patch)
treed3dd179c0f6e2680a81d0600fa07405b2755a437 /actioncable
parent30f526865016ac4cc99e4df621198f544ab7c3a0 (diff)
parentff5f1d33fc6ff1ac8a1e7b58744df41d28d387b1 (diff)
downloadrails-8857e0604907969550cc6fbba29fd4d78928f9cd.tar.gz
rails-8857e0604907969550cc6fbba29fd4d78928f9cd.tar.bz2
rails-8857e0604907969550cc6fbba29fd4d78928f9cd.zip
Merge pull request #24276 from artfuldodger/patch-2
Fix WebSocket already open log message typo
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/app/assets/javascripts/action_cable/connection.coffee2
1 files changed, 1 insertions, 1 deletions
diff --git a/actioncable/app/assets/javascripts/action_cable/connection.coffee b/actioncable/app/assets/javascripts/action_cable/connection.coffee
index 92272cc5b8..3a139acf3a 100644
--- a/actioncable/app/assets/javascripts/action_cable/connection.coffee
+++ b/actioncable/app/assets/javascripts/action_cable/connection.coffee
@@ -20,7 +20,7 @@ class ActionCable.Connection
open: =>
if @isActive()
- ActionCable.log("Attemped to open WebSocket, but existing socket is #{@getState()}")
+ ActionCable.log("Attempted to open WebSocket, but existing socket is #{@getState()}")
throw new Error("Existing connection must be closed before opening")
else
ActionCable.log("Opening WebSocket, current state is #{@getState()}")