From d2ca1f109a23db81f08fcdb1ae545f0714091fcf Mon Sep 17 00:00:00 2001 From: Eric Guo Date: Thu, 28 Jan 2016 13:37:42 +0800 Subject: [PATCH] web-console version 3.1.0 not working with master version. https://github.com/rails/web-console/issues/184 --- Gemfile | 2 +- Gemfile.lock | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/Gemfile b/Gemfile index 7833f4b..804f7e4 100644 --- a/Gemfile +++ b/Gemfile @@ -37,7 +37,7 @@ end group :development do # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 3.0' + gem 'web-console', '~> 3.0.0' end # Windows does not include zoneinfo files, so bundle the tzinfo-data gem diff --git a/Gemfile.lock b/Gemfile.lock index 785c5c2..cb55113 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,8 @@ GEM actioncable (5.0.0.beta1.1) actionpack (= 5.0.0.beta1.1) coffee-rails (~> 4.1.0) - nio4r (~> 1.2) + eventmachine (~> 1.0) + faye-websocket (~> 0.10.0) websocket-driver (~> 0.6.1) actionmailer (5.0.0.beta1.1) actionpack (= 5.0.0.beta1.1) @@ -54,7 +55,11 @@ GEM concurrent-ruby (1.0.0) debug_inspector (0.0.2) erubis (2.7.0) + eventmachine (1.0.9.1) execjs (2.6.0) + faye-websocket (0.10.2) + eventmachine (>= 0.12.0) + websocket-driver (>= 0.5.1) globalid (0.3.6) activesupport (>= 4.1.0) i18n (0.7.0) @@ -75,11 +80,10 @@ GEM mini_portile2 (2.0.0) minitest (5.8.4) multi_json (1.11.2) - nio4r (1.2.0) nokogiri (1.6.7.2-x86-mingw32) mini_portile2 (~> 2.0.0.rc2) pg (0.18.4-x86-mingw32) - puma (2.15.3) + puma (2.16.0) rack (2.0.0.alpha) json rack-test (0.6.3) @@ -160,7 +164,7 @@ DEPENDENCIES turbolinks tzinfo-data uglifier (>= 1.3.0) - web-console (~> 3.0) + web-console (~> 3.0.0) BUNDLED WITH 1.11.2