aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMatthew Draper <matthew@trebex.net>2016-10-06 11:41:18 +1030
committerMatthew Draper <matthew@trebex.net>2016-10-06 12:51:26 +1030
commitacd7ba795ed0f69691b7e6879f17fa50d7664ea0 (patch)
treecd79085d4b31aa86ab67bc6b76fa900f83948a2c /Gemfile.lock
parent4a7c5685c86d0349c98b2725ad01aa70ebcc3581 (diff)
downloadrails-acd7ba795ed0f69691b7e6879f17fa50d7664ea0.tar.gz
rails-acd7ba795ed0f69691b7e6879f17fa50d7664ea0.tar.bz2
rails-acd7ba795ed0f69691b7e6879f17fa50d7664ea0.zip
Use a branch of websocket-client-simple, to work around read/close race
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock14
1 files changed, 10 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 14635a8cb2..0d70b24b5c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -30,6 +30,15 @@ GIT
ffi (>= 0.5.0)
GIT
+ remote: https://github.com/matthewd/websocket-client-simple.git
+ revision: e161305f1a466b9398d86df3b1731b03362da91b
+ branch: close-race
+ specs:
+ websocket-client-simple (0.3.0)
+ event_emitter
+ websocket
+
+GIT
remote: https://github.com/resque/resque.git
revision: 20d885065ac19e7f7d7a982f4ed1296083db0300
specs:
@@ -350,9 +359,6 @@ GEM
nokogiri
wdm (0.1.1)
websocket (1.2.3)
- websocket-client-simple (0.3.0)
- event_emitter
- websocket
websocket-driver (0.6.4)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.2)
@@ -414,7 +420,7 @@ DEPENDENCIES
uglifier (>= 1.3.0)
w3c_validators
wdm (>= 0.1.0)
- websocket-client-simple
+ websocket-client-simple!
BUNDLED WITH
1.13.2