From 1e36e02df3b9a6cb7ec3aa42d94df63c2ff9b42d Mon Sep 17 00:00:00 2001
From: "Roman V. Babenko" <romanvbabenko@gmail.com>
Date: Fri, 6 Apr 2012 07:59:57 +0300
Subject: Class variables has been fixed to Singleton instance variables at
 Rails module

---
 railties/lib/rails.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/railties/lib/rails.rb b/railties/lib/rails.rb
index 6b431d3ee3..945063e55c 100644
--- a/railties/lib/rails.rb
+++ b/railties/lib/rails.rb
@@ -25,11 +25,11 @@ module Rails
 
   class << self
     def application
-      @@application ||= nil
+      @application ||= nil
     end
 
     def application=(application)
-      @@application = application
+      @application = application
     end
 
     # The Configuration instance used to configure the Rails environment
@@ -46,15 +46,15 @@ module Rails
     end
 
     def logger
-      @@logger ||= nil
+      @logger ||= nil
     end
 
     def logger=(logger)
-      @@logger = logger
+      @logger = logger
     end
 
     def backtrace_cleaner
-      @@backtrace_cleaner ||= begin
+      @backtrace_cleaner ||= begin
         # Relies on Active Support, so we have to lazy load to postpone definition until AS has been loaded
         require 'rails/backtrace_cleaner'
         Rails::BacktraceCleaner.new
@@ -74,11 +74,11 @@ module Rails
     end
 
     def cache
-      @@cache ||= nil
+      @cache ||= nil
     end
 
     def cache=(cache)
-      @@cache = cache
+      @cache = cache
     end
 
     # Returns all rails groups for loading based on:
-- 
cgit v1.2.3