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/object/with_options.rb | |
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/object/with_options.rb')
-rw-r--r-- | activesupport/lib/active_support/core_ext/object/with_options.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/core_ext/object/with_options.rb b/activesupport/lib/active_support/core_ext/object/with_options.rb index 3a44e08630..68a8da25ff 100644 --- a/activesupport/lib/active_support/core_ext/object/with_options.rb +++ b/activesupport/lib/active_support/core_ext/object/with_options.rb @@ -1,4 +1,4 @@ -require "active_support/option_merger" +require_relative "../../option_merger" class Object # An elegant way to factor duplication out of options passed to a series of |