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/integer | |
| 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/integer')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/integer/inflections.rb | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/integer/time.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/activesupport/lib/active_support/core_ext/integer/inflections.rb b/activesupport/lib/active_support/core_ext/integer/inflections.rb index bc21b65533..0b2ada8b22 100644 --- a/activesupport/lib/active_support/core_ext/integer/inflections.rb +++ b/activesupport/lib/active_support/core_ext/integer/inflections.rb @@ -1,4 +1,4 @@ -require "active_support/inflector" +require_relative "../../inflector" class Integer # Ordinalize turns a number into an ordinal string used to denote the diff --git a/activesupport/lib/active_support/core_ext/integer/time.rb b/activesupport/lib/active_support/core_ext/integer/time.rb index 74baae3639..d5625dfd1c 100644 --- a/activesupport/lib/active_support/core_ext/integer/time.rb +++ b/activesupport/lib/active_support/core_ext/integer/time.rb @@ -1,5 +1,5 @@ -require "active_support/duration" -require "active_support/core_ext/numeric/time" +require_relative "../../duration" +require_relative "../numeric/time" class Integer # Enables the use of time calculations and declarations, like <tt>45.minutes + |