aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/api.rb
diff options
context:
space:
mode:
authorXavier Noria <fxn@hashref.com>2017-07-02 14:35:13 -0700
committerGitHub <noreply@github.com>2017-07-02 14:35:13 -0700
commit111736ddf6fe81f3e42af37dfa1b0520a8c91473 (patch)
tree050eea5a719faa416b64b804617f8755b6500e09 /actionpack/lib/action_controller/api.rb
parentf443460670576cd82a806a851b7124479e8325c9 (diff)
parent92c29d82eb2f323bb1338a039229a66057a7d137 (diff)
downloadrails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.gz
rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.tar.bz2
rails-111736ddf6fe81f3e42af37dfa1b0520a8c91473.zip
Merge pull request #29638 from amatsuda/require_relative_2017
Using require_relative in the Rails codebase
Diffstat (limited to 'actionpack/lib/action_controller/api.rb')
-rw-r--r--actionpack/lib/action_controller/api.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/api.rb b/actionpack/lib/action_controller/api.rb
index 94698df730..2bfa65021d 100644
--- a/actionpack/lib/action_controller/api.rb
+++ b/actionpack/lib/action_controller/api.rb
@@ -1,6 +1,6 @@
require "action_view"
require "action_controller"
-require "action_controller/log_subscriber"
+require_relative "log_subscriber"
module ActionController
# API Controller is a lightweight version of <tt>ActionController::Base</tt>,