diff options
| author | Javan Makhmali <javan@javan.us> | 2015-07-24 12:05:31 -0400 |
|---|---|---|
| committer | Javan Makhmali <javan@javan.us> | 2015-07-24 12:05:31 -0400 |
| commit | ccfb1a8b1c6b8651062cce5a80c405013ea8f465 (patch) | |
| tree | b7c334998171702cc39df0e618ac9d150671c509 | |
| parent | dc4f8b352cb6b14aff8690f410e4a5bcb2a8280e (diff) | |
| download | rails-ccfb1a8b1c6b8651062cce5a80c405013ea8f465.tar.gz rails-ccfb1a8b1c6b8651062cce5a80c405013ea8f465.tar.bz2 rails-ccfb1a8b1c6b8651062cce5a80c405013ea8f465.zip | |
Use Celluloid 0.16.0 until termination issue in 0.17.0 is resolved
The issue: https://github.com/celluloid/celluloid/issues/637
| -rw-r--r-- | Gemfile.lock | 46 | ||||
| -rw-r--r-- | actioncable.gemspec | 3 | ||||
| -rw-r--r-- | lib/action_cable.rb | 2 |
3 files changed, 5 insertions, 46 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 7a84c5fed5..0299c50f9f 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,7 +4,7 @@ PATH actioncable (0.1.0) actionpack (>= 4.2.0) activesupport (>= 4.2.0) - celluloid (~> 0.17.0) + celluloid (~> 0.16.0) coffee-rails em-hiredis (~> 0.3.0) faye-websocket (~> 0.10.0) @@ -34,46 +34,7 @@ GEM thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) builder (3.2.2) - celluloid (0.17.0) - bundler - celluloid-essentials - celluloid-extras - celluloid-fsm - celluloid-pool - celluloid-supervision - dotenv - nenv - rspec-logsplit (>= 0.1.2) - timers (~> 4.0.0) - celluloid-essentials (0.20.1.1) - bundler - dotenv - nenv - rspec-logsplit (>= 0.1.2) - timers (~> 4.0.0) - celluloid-extras (0.20.0) - bundler - dotenv - nenv - rspec-logsplit (>= 0.1.2) - timers (~> 4.0.0) - celluloid-fsm (0.20.0) - bundler - dotenv - nenv - rspec-logsplit (>= 0.1.2) - timers (~> 4.0.0) - celluloid-pool (0.20.0) - bundler - dotenv - nenv - rspec-logsplit (>= 0.1.2) - timers (~> 4.0.0) - celluloid-supervision (0.20.0) - bundler - dotenv - nenv - rspec-logsplit (>= 0.1.2) + celluloid (0.16.0) timers (~> 4.0.0) coffee-rails (4.1.0) coffee-script (>= 2.2.0) @@ -82,7 +43,6 @@ GEM coffee-script-source execjs coffee-script-source (1.9.1.1) - dotenv (2.0.2) em-hiredis (0.3.0) eventmachine (~> 1.0) hiredis (~> 0.5.0) @@ -103,7 +63,6 @@ GEM minitest (5.7.0) mocha (1.1.0) metaclass (~> 0.0.1) - nenv (0.2.0) nokogiri (1.6.6.2) mini_portile (~> 0.6.0) puma (2.12.2) @@ -125,7 +84,6 @@ GEM thor (>= 0.18.1, < 2.0) rake (10.4.2) redis (3.2.1) - rspec-logsplit (0.1.3) thor (0.19.1) thread_safe (0.3.5) timers (4.0.1) diff --git a/actioncable.gemspec b/actioncable.gemspec index 2d07d0d9eb..e3aaa21fe7 100644 --- a/actioncable.gemspec +++ b/actioncable.gemspec @@ -15,7 +15,8 @@ Gem::Specification.new do |s| s.add_dependency 'actionpack', '>= 4.2.0' s.add_dependency 'faye-websocket', '~> 0.10.0' s.add_dependency 'websocket-driver', '~> 0.6.1' - s.add_dependency 'celluloid', '~> 0.17.0' + # Use 0.16.0 until https://github.com/celluloid/celluloid/issues/637 is resolved + s.add_dependency 'celluloid', '~> 0.16.0' s.add_dependency 'em-hiredis', '~> 0.3.0' s.add_dependency 'redis', '~> 3.0' s.add_dependency 'coffee-rails' diff --git a/lib/action_cable.rb b/lib/action_cable.rb index 9ce63dae28..968adafc25 100644 --- a/lib/action_cable.rb +++ b/lib/action_cable.rb @@ -11,7 +11,7 @@ require 'active_support/core_ext/module/delegation' require 'active_support/callbacks' require 'faye/websocket' -require 'celluloid/current' +require 'celluloid' require 'em-hiredis' require 'redis' |