diff options
author | Xavier Noria <fxn@hashref.com> | 2017-07-02 14:35:13 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-07-02 14:35:13 -0700 |
commit | 111736ddf6fe81f3e42af37dfa1b0520a8c91473 (patch) | |
tree | 050eea5a719faa416b64b804617f8755b6500e09 /activesupport/lib/active_support/core_ext/class | |
parent | f443460670576cd82a806a851b7124479e8325c9 (diff) | |
parent | 92c29d82eb2f323bb1338a039229a66057a7d137 (diff) | |
download | rails-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 'activesupport/lib/active_support/core_ext/class')
3 files changed, 6 insertions, 6 deletions
diff --git a/activesupport/lib/active_support/core_ext/class/attribute.rb b/activesupport/lib/active_support/core_ext/class/attribute.rb index 8caddcd5c3..26b826b39b 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute.rb @@ -1,6 +1,6 @@ -require "active_support/core_ext/kernel/singleton_class" -require "active_support/core_ext/module/remove_method" -require "active_support/core_ext/array/extract_options" +require_relative "../kernel/singleton_class" +require_relative "../module/remove_method" +require_relative "../array/extract_options" class Class # Declare a class-level attribute whose value is inheritable by subclasses. diff --git a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb index 0f767925ed..eebf2e294a 100644 --- a/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb +++ b/activesupport/lib/active_support/core_ext/class/attribute_accessors.rb @@ -1,4 +1,4 @@ # cattr_* became mattr_* aliases in 7dfbd91b0780fbd6a1dd9bfbc176e10894871d2d, # but we keep this around for libraries that directly require it knowing they # want cattr_*. No need to deprecate. -require "active_support/core_ext/module/attribute_accessors" +require_relative "../module/attribute_accessors" diff --git a/activesupport/lib/active_support/core_ext/class/subclasses.rb b/activesupport/lib/active_support/core_ext/class/subclasses.rb index 62397d9508..545ad7fb3e 100644 --- a/activesupport/lib/active_support/core_ext/class/subclasses.rb +++ b/activesupport/lib/active_support/core_ext/class/subclasses.rb @@ -1,5 +1,5 @@ -require "active_support/core_ext/module/anonymous" -require "active_support/core_ext/module/reachable" +require_relative "../module/anonymous" +require_relative "../module/reachable" class Class begin |