From e0deec2e68c7db74a9c8ed25d8e7eb178d30e6ca Mon Sep 17 00:00:00 2001 From: yui-knk Date: Sat, 2 Apr 2016 13:11:44 +0900 Subject: Remove not needed including Because `DateTime` inherits `Date` and `Date` includes `DateAndTime::Zones`, `DateTime` not need to include `DateAndTime::Zones` again. --- activesupport/lib/active_support/core_ext/date_time.rb | 1 - activesupport/lib/active_support/core_ext/date_time/zones.rb | 6 ------ 2 files changed, 7 deletions(-) delete mode 100644 activesupport/lib/active_support/core_ext/date_time/zones.rb (limited to 'activesupport') diff --git a/activesupport/lib/active_support/core_ext/date_time.rb b/activesupport/lib/active_support/core_ext/date_time.rb index bcb228b09a..5450533935 100644 --- a/activesupport/lib/active_support/core_ext/date_time.rb +++ b/activesupport/lib/active_support/core_ext/date_time.rb @@ -2,4 +2,3 @@ require 'active_support/core_ext/date_time/acts_like' require 'active_support/core_ext/date_time/blank' require 'active_support/core_ext/date_time/calculations' require 'active_support/core_ext/date_time/conversions' -require 'active_support/core_ext/date_time/zones' diff --git a/activesupport/lib/active_support/core_ext/date_time/zones.rb b/activesupport/lib/active_support/core_ext/date_time/zones.rb deleted file mode 100644 index c39f358395..0000000000 --- a/activesupport/lib/active_support/core_ext/date_time/zones.rb +++ /dev/null @@ -1,6 +0,0 @@ -require 'date' -require 'active_support/core_ext/date_and_time/zones' - -class DateTime - include DateAndTime::Zones -end -- cgit v1.2.3