diff options
| author | Yves Senn <yves.senn@gmail.com> | 2014-11-05 10:32:47 +0100 |
|---|---|---|
| committer | Yves Senn <yves.senn@gmail.com> | 2014-11-05 10:32:47 +0100 |
| commit | 57f72f249285c6af1cd90f79e29a11710ae49964 (patch) | |
| tree | e23ac3c9a3ed2892f7dfca979af21561e254f187 /activesupport | |
| parent | 38a7d801bae9fa62328cd65a7edd83d75aa58484 (diff) | |
| parent | e0109460526b9595007905475437ccbf77739e7f (diff) | |
| download | rails-57f72f249285c6af1cd90f79e29a11710ae49964.tar.gz rails-57f72f249285c6af1cd90f79e29a11710ae49964.tar.bz2 rails-57f72f249285c6af1cd90f79e29a11710ae49964.zip | |
Merge pull request #17515 from prathamesh-sonpatki/rm-require
Removed the unused require of proxy_object
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/duration.rb | 1 | ||||
| -rw-r--r-- | activesupport/test/core_ext/duration_test.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/duration.rb b/activesupport/lib/active_support/duration.rb index 584fc1e1c5..baa83223d2 100644 --- a/activesupport/lib/active_support/duration.rb +++ b/activesupport/lib/active_support/duration.rb @@ -1,4 +1,3 @@ -require 'active_support/proxy_object' require 'active_support/core_ext/array/conversions' require 'active_support/core_ext/object/acts_like' diff --git a/activesupport/test/core_ext/duration_test.rb b/activesupport/test/core_ext/duration_test.rb index 5a2af7f943..a5d254e115 100644 --- a/activesupport/test/core_ext/duration_test.rb +++ b/activesupport/test/core_ext/duration_test.rb @@ -30,7 +30,6 @@ class DurationTest < ActiveSupport::TestCase assert ActiveSupport::Duration === 1.day assert !(ActiveSupport::Duration === 1.day.to_i) assert !(ActiveSupport::Duration === 'foo') - assert !(ActiveSupport::Duration === ActiveSupport::ProxyObject.new) end def test_equals |