aboutsummaryrefslogtreecommitdiffstats
path: root/activesupport
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2012-11-05 18:41:18 -0800
committerAaron Patterson <aaron.patterson@gmail.com>2012-11-07 17:13:17 +0900
commit26702a6d3461f4a1c75165030b96886514ecb877 (patch)
tree388d0cd2193df86219e96f0db443028eac181466 /activesupport
parent640bec511134be317e6a5b84c6123e6a7c3a80bd (diff)
downloadrails-26702a6d3461f4a1c75165030b96886514ecb877.tar.gz
rails-26702a6d3461f4a1c75165030b96886514ecb877.tar.bz2
rails-26702a6d3461f4a1c75165030b96886514ecb877.zip
fix warnings in Ruby 2.0
Diffstat (limited to 'activesupport')
-rw-r--r--activesupport/lib/active_support/core_ext/date/calculations.rb2
-rw-r--r--activesupport/lib/active_support/core_ext/time/zones.rb2
2 files changed, 4 insertions, 0 deletions
diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 02ae57b4a6..439d380af7 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -8,6 +8,8 @@ require 'active_support/core_ext/date_and_time/calculations'
class Date
include DateAndTime::Calculations
+ @beginning_of_week_default = nil
+
class << self
attr_accessor :beginning_of_week_default
diff --git a/activesupport/lib/active_support/core_ext/time/zones.rb b/activesupport/lib/active_support/core_ext/time/zones.rb
index 139d48f59c..796c5f9805 100644
--- a/activesupport/lib/active_support/core_ext/time/zones.rb
+++ b/activesupport/lib/active_support/core_ext/time/zones.rb
@@ -1,6 +1,8 @@
require 'active_support/time_with_zone'
class Time
+ @zone_default = nil
+
class << self
attr_accessor :zone_default