aboutsummaryrefslogtreecommitdiffstats
path: root/actioncable/lib/action_cable
diff options
context:
space:
mode:
authorAkira Matsuda <ronnie@dio.jp>2017-10-21 22:24:35 +0900
committerAkira Matsuda <ronnie@dio.jp>2017-10-21 22:48:29 +0900
commit40a8db632958641a25f1a21d1e4ad3315ace9351 (patch)
tree46621bbea0079f1553b3e1417671c3e151690ccb /actioncable/lib/action_cable
parentfeb6ecd3130f852b86226e0a592f1f40365d89b4 (diff)
downloadrails-40a8db632958641a25f1a21d1e4ad3315ace9351.tar.gz
rails-40a8db632958641a25f1a21d1e4ad3315ace9351.tar.bz2
rails-40a8db632958641a25f1a21d1e4ad3315ace9351.zip
[Action Cable] require_relative => require
This basically reverts f851e1f705f26d8f92f0fc1b265b20bc389d23cb
Diffstat (limited to 'actioncable/lib/action_cable')
-rw-r--r--actioncable/lib/action_cable/engine.rb2
-rw-r--r--actioncable/lib/action_cable/subscription_adapter/async.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actioncable/lib/action_cable/engine.rb b/actioncable/lib/action_cable/engine.rb
index c961f47342..53cbb597cd 100644
--- a/actioncable/lib/action_cable/engine.rb
+++ b/actioncable/lib/action_cable/engine.rb
@@ -2,7 +2,7 @@
require "rails"
require "action_cable"
-require_relative "helpers/action_cable_helper"
+require "action_cable/helpers/action_cable_helper"
require "active_support/core_ext/hash/indifferent_access"
module ActionCable
diff --git a/actioncable/lib/action_cable/subscription_adapter/async.rb b/actioncable/lib/action_cable/subscription_adapter/async.rb
index 96c18c4a2f..c9930299c7 100644
--- a/actioncable/lib/action_cable/subscription_adapter/async.rb
+++ b/actioncable/lib/action_cable/subscription_adapter/async.rb
@@ -1,6 +1,6 @@
# frozen_string_literal: true
-require_relative "inline"
+require "action_cable/subscription_adapter/inline"
module ActionCable
module SubscriptionAdapter