From ded5f5b261b324767406baca41193c08c966008a Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Wed, 12 Dec 2012 23:27:10 -0200
Subject: [PATCH] Revert some warning removals related to Ruby 2.0

These warnings were actually a bug in Ruby 2.0, the accessors should not
be raising such warnings, they are only meant for ivars.

-

Revert "fix warnings in Ruby 2.0"

This reverts commit 26702a6d3461f4a1c75165030b96886514ecb877.

-

Revert "Merge pull request #8282 from arunagw/warning_removed_for_ruby2"

This reverts commit f63d6544e45e78cda29c0c56fbdf3d9e1f405340, reversing
changes made to 3a890681fad8218305585036abed6d7463a44e41.
---
 activesupport/lib/active_support/core_ext/date/calculations.rb | 2 --
 activesupport/lib/active_support/core_ext/time/zones.rb        | 2 --
 railties/lib/rails/engine.rb                                   | 2 --
 3 files changed, 6 deletions(-)

diff --git a/activesupport/lib/active_support/core_ext/date/calculations.rb b/activesupport/lib/active_support/core_ext/date/calculations.rb
index 421aa12100..106a65610c 100644
--- a/activesupport/lib/active_support/core_ext/date/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/date/calculations.rb
@@ -8,8 +8,6 @@
 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 796c5f9805..139d48f59c 100644
--- a/activesupport/lib/active_support/core_ext/time/zones.rb
+++ b/activesupport/lib/active_support/core_ext/time/zones.rb
@@ -1,8 +1,6 @@
 require 'active_support/time_with_zone'
 
 class Time
-  @zone_default = nil
-
   class << self
     attr_accessor :zone_default
 
diff --git a/railties/lib/rails/engine.rb b/railties/lib/rails/engine.rb
index 3ba62039de..25cdd75cd9 100644
--- a/railties/lib/rails/engine.rb
+++ b/railties/lib/rails/engine.rb
@@ -407,8 +407,6 @@ def find(path)
       end
     end
 
-    self.isolated = false
-
     delegate :middleware, :root, :paths, to: :config
     delegate :engine_name, :isolated?, to: :class
 
-- 
GitLab