aboutsummaryrefslogtreecommitdiffstats
path: root/lib/action_cable.rb
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2015-10-14 21:48:41 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2015-10-14 21:48:41 +0200
commit18c79bf1930c558c6a8f0cd7889d3cbef741e294 (patch)
tree430f3d1e1e94e4b1f70bd0254496987d9c6000b1 /lib/action_cable.rb
parent60d2f4becbf85bcecd243d9d0a529658d52b24fe (diff)
parentaba40cc0189ac0a3dcc062fb80cfbfceb8694e4c (diff)
downloadrails-18c79bf1930c558c6a8f0cd7889d3cbef741e294.tar.gz
rails-18c79bf1930c558c6a8f0cd7889d3cbef741e294.tar.bz2
rails-18c79bf1930c558c6a8f0cd7889d3cbef741e294.zip
Merge pull request #93 from lsylvester/railstie
add railtie and set default allowed_request_origins for development
Diffstat (limited to 'lib/action_cable.rb')
-rw-r--r--lib/action_cable.rb2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/action_cable.rb b/lib/action_cable.rb
index d2c5251634..de1b08f789 100644
--- a/lib/action_cable.rb
+++ b/lib/action_cable.rb
@@ -17,6 +17,8 @@ require 'em-hiredis'
require 'redis'
require 'action_cable/engine' if defined?(Rails)
+require 'action_cable/railtie' if defined?(Rails)
+
require 'action_cable/version'
module ActionCable