From 01c320001bcce617196270f3d398d48a89a6ea2a Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sat, 16 Jan 2016 15:42:20 +0100 Subject: Revert "Merge pull request #22977 from rails/revert-22934-master" This reverts commit d0393fccffc118a5de37654aa222774b66123393, reversing changes made to 3b7ccadfc1c8dfec61af898167e1300b17f5cf25. --- actioncable/lib/action_cable/server/base.rb | 3 --- 1 file changed, 3 deletions(-) (limited to 'actioncable/lib/action_cable/server/base.rb') diff --git a/actioncable/lib/action_cable/server/base.rb b/actioncable/lib/action_cable/server/base.rb index 740e4b301e..cfd0a65f0f 100644 --- a/actioncable/lib/action_cable/server/base.rb +++ b/actioncable/lib/action_cable/server/base.rb @@ -1,6 +1,3 @@ -# FIXME: Cargo culted fix from https://github.com/celluloid/celluloid-pool/issues/10 -require 'celluloid/current' - require 'em-hiredis' module ActionCable -- cgit v1.2.3