aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport/lib/active_support
diff options
context:
space:
mode:
authorPrathamesh Sonpatki <csonpatki@gmail.com>2014-11-05 12:01:06 +0530
committerPrathamesh Sonpatki <csonpatki@gmail.com>2014-11-05 15:00:19 +0530
commite0109460526b9595007905475437ccbf77739e7f (patch)
treea69788506344f6adfb8dc1e6a6c9106bb0493939 /activesupport/lib/active_support
parentbb441843a76c14285694588b9b36d32ff59c0d48 (diff)
downloadrails-e0109460526b9595007905475437ccbf77739e7f.tar.gz
rails-e0109460526b9595007905475437ccbf77739e7f.tar.bz2
rails-e0109460526b9595007905475437ccbf77739e7f.zip
Removed the unused require of proxy_object and test related to it
- Reference : https://github.com/rails/rails/pull/17493#issuecomment-61739359 - Duration stopped inheriting from ProxyObject in https://github.com/rails/rails/pull/16574
Diffstat (limited to 'activesupport/lib/active_support')
-rw-r--r--activesupport/lib/active_support/duration.rb1
1 files changed, 0 insertions, 1 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'