diff options
| author | Rafael França <rafaelmfranca@gmail.com> | 2019-06-24 14:57:43 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 14:57:43 -0400 |
| commit | 1aa90ddc1c2ae5d44f64f41c6eda3345054d69c2 (patch) | |
| tree | 775cdd2955d593fd1be591fab16dce047a62e4c3 /activesupport | |
| parent | b65f88652f835093030bf65b9e31e727ba58a6de (diff) | |
| parent | 968fcd6b80ab884430f40e27e0e4be2ba0cc3ce9 (diff) | |
| download | rails-1aa90ddc1c2ae5d44f64f41c6eda3345054d69c2.tar.gz rails-1aa90ddc1c2ae5d44f64f41c6eda3345054d69c2.tar.bz2 rails-1aa90ddc1c2ae5d44f64f41c6eda3345054d69c2.zip | |
Merge pull request #36530 from benoittgt/source_annotation_deprecation_issue
Rely on Kernel require instead of self require
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/deprecation/proxy_wrappers.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb index 56f1e23136..fab6c1cd73 100644 --- a/activesupport/lib/active_support/deprecation/proxy_wrappers.rb +++ b/activesupport/lib/active_support/deprecation/proxy_wrappers.rb @@ -122,7 +122,7 @@ module ActiveSupport # ["Mercury", "Venus", "Earth", "Mars", "Jupiter", "Saturn", "Uranus", "Neptune"] class DeprecatedConstantProxy < DeprecationProxy def initialize(old_const, new_const, deprecator = ActiveSupport::Deprecation.instance, message: "#{old_const} is deprecated! Use #{new_const} instead.") - require "active_support/inflector/methods" + Kernel.require "active_support/inflector/methods" @old_const = old_const @new_const = new_const |