aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoryui-knk <spiketeika@gmail.com>2016-04-02 13:11:44 +0900
committeryui-knk <spiketeika@gmail.com>2016-04-02 13:11:44 +0900
commite0deec2e68c7db74a9c8ed25d8e7eb178d30e6ca (patch)
treefb293d45de56ee8642ce9da10358c1a3c153d65a
parent863d385012824ac9a792b0c337f06c562914149f (diff)
downloadrails-e0deec2e68c7db74a9c8ed25d8e7eb178d30e6ca.tar.gz
rails-e0deec2e68c7db74a9c8ed25d8e7eb178d30e6ca.tar.bz2
rails-e0deec2e68c7db74a9c8ed25d8e7eb178d30e6ca.zip
Remove not needed including
Because `DateTime` inherits `Date` and `Date` includes `DateAndTime::Zones`, `DateTime` not need to include `DateAndTime::Zones` again.
-rw-r--r--activesupport/lib/active_support/core_ext/date_time.rb1
-rw-r--r--activesupport/lib/active_support/core_ext/date_time/zones.rb6
2 files changed, 0 insertions, 7 deletions
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