aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-15 16:05:06 -0200
committerRafael Mendonça França <rafaelmfranca@gmail.com>2015-12-15 16:05:42 -0200
commit649b9d93219b5b38bb2fccba5124c4e013726d9e (patch)
tree81f3ccc09c807c20ea6fc7ec1be22eb70f773fb1 /actioncable
parent23faa711c951b93df7b6ba61239e47395b766fee (diff)
downloadrails-649b9d93219b5b38bb2fccba5124c4e013726d9e.tar.gz
rails-649b9d93219b5b38bb2fccba5124c4e013726d9e.tar.bz2
rails-649b9d93219b5b38bb2fccba5124c4e013726d9e.zip
Move the require to the right place
Diffstat (limited to 'actioncable')
-rw-r--r--actioncable/lib/action_cable/engine.rb1
-rw-r--r--actioncable/lib/action_cable/server/configuration.rb2
2 files changed, 1 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
index fbe8038a57..6d747d6992 100644
--- a/actioncable/lib/action_cable/engine.rb
+++ b/actioncable/lib/action_cable/engine.rb
@@ -1,6 +1,7 @@
require "rails"
require "action_cable"
require "action_cable/helpers/action_cable_helper"
+require "active_support/core_ext/hash/indifferent_access"
module ActionCable
class Railtie < Rails::Engine # :nodoc:
diff --git a/actioncable/lib/action_cable/server/configuration.rb b/actioncable/lib/action_cable/server/configuration.rb
index c2d51b4a9f..5d65f5e0e9 100644
--- a/actioncable/lib/action_cable/server/configuration.rb
+++ b/actioncable/lib/action_cable/server/configuration.rb
@@ -1,5 +1,3 @@
-require 'active_support/core_ext/hash/indifferent_access'
-
module ActionCable
module Server
# An instance of this configuration object is available via ActionCable.server.config, which allows you to tweak the configuration points