diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-04 11:03:46 -0700 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2013-07-04 11:03:46 -0700 |
| commit | d5c3bf9722abd5733a769c8d789de3f74dbfb92d (patch) | |
| tree | ef0d62d26fb7be066ce35c04b02a0f3d489d857a /activesupport | |
| parent | f06fdf5b970094ba79911dfad7536e5a161f845b (diff) | |
| parent | 77b587f942bf3768e5b680ac5e9f24c03a40c607 (diff) | |
| download | rails-d5c3bf9722abd5733a769c8d789de3f74dbfb92d.tar.gz rails-d5c3bf9722abd5733a769c8d789de3f74dbfb92d.tar.bz2 rails-d5c3bf9722abd5733a769c8d789de3f74dbfb92d.zip | |
Merge pull request #11298 from raysrashmi/removed-deprecation-require
Removed unsued deprecation require
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/lib/active_support/core_ext/date_time/calculations.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/time/calculations.rb | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/core_ext/date_time/calculations.rb b/activesupport/lib/active_support/core_ext/date_time/calculations.rb index ff59be0022..7d4f716bb6 100644 --- a/activesupport/lib/active_support/core_ext/date_time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/date_time/calculations.rb @@ -1,5 +1,4 @@ require 'date' -require 'active_support/deprecation' class DateTime class << self diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb index f55a2797b5..fa74fee78a 100644 --- a/activesupport/lib/active_support/core_ext/time/calculations.rb +++ b/activesupport/lib/active_support/core_ext/time/calculations.rb @@ -3,7 +3,6 @@ require 'active_support/core_ext/time/conversions' require 'active_support/time_with_zone' require 'active_support/core_ext/time/zones' require 'active_support/core_ext/date_and_time/calculations' -require 'active_support/deprecation' class Time include DateAndTime::Calculations |