diff options
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 26 |
1 files changed, 15 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 14635a8cb2..d4059c607d 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: @@ -201,7 +210,7 @@ GEM rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (2.0.2) kindlerb (0.1.1) mustache nokogiri @@ -267,8 +276,7 @@ GEM loofah (~> 2.0) rake (11.3.0) rb-fsevent (0.9.7) - rdoc (4.2.2) - json (~> 1.4) + rdoc (5.0.0.beta2) redcarpet (3.2.3) redis (3.3.1) redis-namespace (1.5.2) @@ -287,9 +295,8 @@ GEM sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) tilt (>= 1.1, < 3) - sdoc (0.4.1) - json (~> 1.7, >= 1.7.7) - rdoc (~> 4.0) + sdoc (1.0.0.beta2) + rdoc (= 5.0.0.beta2) selenium-webdriver (2.53.4) childprocess (~> 0.5) rubyzip (~> 1.0) @@ -350,9 +357,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) @@ -402,7 +406,7 @@ DEPENDENCIES resque-scheduler sass! sass-rails - sdoc (~> 0.4.0) + sdoc (= 1.0.0.beta2) sequel sidekiq sneakers @@ -414,7 +418,7 @@ DEPENDENCIES uglifier (>= 1.3.0) w3c_validators wdm (>= 0.1.0) - websocket-client-simple + websocket-client-simple! BUNDLED WITH 1.13.2 |