From 322dca293b3716ccaa09e7e82046e539b0d2ffda Mon Sep 17 00:00:00 2001
From: Matthew Draper <matthew@trebex.net>
Date: Thu, 21 Jan 2016 14:59:11 +1030
Subject: Import the relevant portions of faye-websocket

(as adapted to use concurrent-ruby / nio4r instead of eventmachine)
---
 Gemfile.lock | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

(limited to 'Gemfile.lock')

diff --git a/Gemfile.lock b/Gemfile.lock
index 3467c23d6f..61b90d305c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -19,16 +19,6 @@ GIT
       qu (= 0.2.0)
       redis-namespace
 
-GIT
-  remote: git://github.com/matthewd/faye-websocket-ruby.git
-  revision: f608bb57844b91b397817b06ab6bf744324010ab
-  branch: no-em-concept
-  specs:
-    faye-websocket (0.10.2)
-      concurrent-ruby (~> 1.0)
-      nio4r (~> 1.2)
-      websocket-driver (>= 0.5.1)
-
 GIT
   remote: git://github.com/sass/sass.git
   revision: bce9509f396225d721501ea1070a6871b708abb1
@@ -42,7 +32,7 @@ PATH
     actioncable (5.0.0.beta1)
       actionpack (= 5.0.0.beta1)
       coffee-rails (~> 4.1.0)
-      faye-websocket (~> 0.10.0)
+      nio4r (~> 1.2)
       websocket-driver (~> 0.6.1)
     actionmailer (5.0.0.beta1)
       actionpack (= 5.0.0.beta1)
@@ -314,7 +304,6 @@ DEPENDENCIES
   delayed_job
   delayed_job_active_record
   em-hiredis
-  faye-websocket!
   jquery-rails
   json
   kindlerb (= 0.1.1)
-- 
cgit v1.2.3