From ed63a9dfd83623a19d0da2fbd78b107ede83e73e Mon Sep 17 00:00:00 2001 From: Ralf Teusner Date: Tue, 1 Mar 2016 11:39:41 +0100 Subject: [PATCH] accidentially added websocket_gem on master branch. This commit removes it again. --- Gemfile | 1 - Gemfile.lock | 5 ----- 2 files changed, 6 deletions(-) diff --git a/Gemfile b/Gemfile index bb0f0034..e77ae876 100644 --- a/Gemfile +++ b/Gemfile @@ -35,7 +35,6 @@ gem 'uglifier', '>= 1.3.0' gem 'will_paginate', '~> 3.0' gem 'tubesock' gem 'faye-websocket' -gem 'websocket-client-simple' group :development do gem 'better_errors', platform: :ruby diff --git a/Gemfile.lock b/Gemfile.lock index e0bcd48f..10284f6f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -106,7 +106,6 @@ GEM excon (>= 0.38.0) json erubis (2.7.0) - event_emitter (0.2.5) eventmachine (1.0.9.1) eventmachine (1.0.9.1-java) excon (0.45.4) @@ -319,9 +318,6 @@ GEM railties (>= 4.0) sprockets-rails (>= 2.0, < 4.0) websocket (1.2.2) - websocket-client-simple (0.2.4) - event_emitter - websocket websocket-driver (0.6.3) websocket-extensions (>= 0.1.0) websocket-driver (0.6.3-java) @@ -392,5 +388,4 @@ DEPENDENCIES turbolinks uglifier (>= 1.3.0) web-console (~> 2.0) - websocket-client-simple will_paginate (~> 3.0)