diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2016-09-23 11:27:04 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-23 11:27:04 -0700 |
| commit | 0bc196518a7369d1279a11faad8aef2442539c82 (patch) | |
| tree | 67dcff86d161c00ccf778da3d38a2643c4235f2f /activesupport | |
| parent | abe3da9f12710ea85be69b17172bef41220037fc (diff) | |
| parent | b355a43f0ea68ed4c9e8a047b2df34b987bfb847 (diff) | |
| download | rails-0bc196518a7369d1279a11faad8aef2442539c82.tar.gz rails-0bc196518a7369d1279a11faad8aef2442539c82.tar.bz2 rails-0bc196518a7369d1279a11faad8aef2442539c82.zip | |
Merge pull request #26563 from knugie/fix_issue_26430
Prevent circular require of proxy_wrappers.rb, Fixes #26430
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/load_error.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/load_error.rb b/activesupport/lib/active_support/core_ext/load_error.rb index 4cb6ffea5e..cd00d1b662 100644 --- a/activesupport/lib/active_support/core_ext/load_error.rb +++ b/activesupport/lib/active_support/core_ext/load_error.rb @@ -1,3 +1,4 @@ +require "active_support/deprecation" require "active_support/deprecation/proxy_wrappers" class LoadError |