aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-07-23 11:59:12 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-07-23 11:59:12 +0200
commitbdbc91ab5840faf1e1c5002eb9d0be442ec52504 (patch)
treec0abf89954a67790aa11031089992a340dea4c78 /lib
parent6ee8bb9310f78de85e6b89c8cac33493b0582383 (diff)
parent5d8c84827361ab7bfe7e2b7afac446f8017d3a02 (diff)
downloadrails-bdbc91ab5840faf1e1c5002eb9d0be442ec52504.tar.gz
rails-bdbc91ab5840faf1e1c5002eb9d0be442ec52504.tar.bz2
rails-bdbc91ab5840faf1e1c5002eb9d0be442ec52504.zip
Merge pull request #35 from twalpole/gem_updates
Update gems and requires
Diffstat (limited to 'lib')
-rw-r--r--lib/action_cable.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index 968adafc25..9ce63dae28 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'
+require 'celluloid/current'
require 'em-hiredis'
require 'redis'