aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2015-12-16 20:05:46 +0100
committerDavid Heinemeier Hansson <david@loudthinking.com>2015-12-16 20:36:11 +0100
commit59db9ebc0ca79f3f7768d05a552c5520c9ed6b01 (patch)
tree08cb8750fcd532c29180b6686b5030287ba9f957 /actioncable
parent4b669dbb9180c7f9740bc24dea403b82c8d6ddc9 (diff)
downloadrails-59db9ebc0ca79f3f7768d05a552c5520c9ed6b01.tar.gz
rails-59db9ebc0ca79f3f7768d05a552c5520c9ed6b01.tar.bz2
rails-59db9ebc0ca79f3f7768d05a552c5520c9ed6b01.zip
Cargo cult fix to make Celluloid behave
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/lib/action_cable/server/base.rb3
1 files changed, 3 insertions, 0 deletions
diff --git a/actioncable/lib/action_cable/server/base.rb b/actioncable/lib/action_cable/server/base.rb
index f1585dc776..5f44bdd1c3 100644
--- a/actioncable/lib/action_cable/server/base.rb
+++ b/actioncable/lib/action_cable/server/base.rb
@@ -1,3 +1,6 @@
+# FIXME: Cargo culted fix from https://github.com/celluloid/celluloid-pool/issues/10
+require 'celluloid/current'
+
require 'em-hiredis'
module ActionCable