From d25fe31c40928712b5e08fe0afb567c3bc88eddf Mon Sep 17 00:00:00 2001
From: Aaron Patterson <aaron.patterson@gmail.com>
Date: Wed, 6 Aug 2014 18:27:16 -0700
Subject: lazily instantiate application subclasses

this means we can meaningfully override methods in the subclass
---
 railties/lib/rails/application.rb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'railties/lib/rails')

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index c5fd08e743..292986b475 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -87,7 +87,7 @@ module Rails
     class << self
       def inherited(base)
         super
-        base.instance
+        Rails.app_class = base
       end
 
       # Makes the +new+ method public.
@@ -117,8 +117,6 @@ module Rails
       @railties          = nil
       @message_verifiers = {}
 
-      Rails.application ||= self
-
       add_lib_to_load_path!
       ActiveSupport.run_load_hooks(:before_configuration, self)
 
-- 
cgit v1.2.3