From 968c994c3b45147a822816d926a37c582c66859f Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Fri, 25 Sep 2009 22:28:09 -0500
Subject: Initializer.run returns an application object

---
 railties/lib/rails/core.rb | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'railties/lib/rails/core.rb')

diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb
index 33695a27b9..4c2789746c 100644
--- a/railties/lib/rails/core.rb
+++ b/railties/lib/rails/core.rb
@@ -14,6 +14,14 @@ module Rails
       @@configuration = configuration
     end
 
+    def application
+      @@application
+    end
+
+    def application=(application)
+      @@application = application
+    end
+
     def initialized?
       @initialized || false
     end
-- 
cgit v1.2.3


From 6f6a589d4b564f5db78735ad0c7225c22ced57ac Mon Sep 17 00:00:00 2001
From: Yehuda Katz + Carl Lerche <ykatz+clerche@engineyard.com>
Date: Mon, 28 Sep 2009 17:57:36 -0700
Subject: Create the application object from config/environment.rb

  This is preliminary and not necessarily reflective of the
  full plan.
---
 railties/lib/rails/core.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'railties/lib/rails/core.rb')

diff --git a/railties/lib/rails/core.rb b/railties/lib/rails/core.rb
index 4c2789746c..4be90de792 100644
--- a/railties/lib/rails/core.rb
+++ b/railties/lib/rails/core.rb
@@ -5,6 +5,14 @@ module Rails
   # ---
   # TODO: w0t?
   class << self
+    def application
+      @@application
+    end
+
+    def application=(application)
+      @@application = application
+    end
+
     # The Configuration instance used to configure the Rails environment
     def configuration
       @@configuration
@@ -14,14 +22,6 @@ module Rails
       @@configuration = configuration
     end
 
-    def application
-      @@application
-    end
-
-    def application=(application)
-      @@application = application
-    end
-
     def initialized?
       @initialized || false
     end
-- 
cgit v1.2.3