From 9f7874ac419f626a6a5157c757669a8b16770ae4 Mon Sep 17 00:00:00 2001
From: Jeremy Kemper <jeremy@bitsweat.net>
Date: Thu, 24 Jun 2010 02:13:08 -0700
Subject: Move Collection responsibility from application to initializable

---
 railties/lib/rails/application.rb   | 2 +-
 railties/lib/rails/initializable.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/railties/lib/rails/application.rb b/railties/lib/rails/application.rb
index 5813c5757d..aabe86715c 100644
--- a/railties/lib/rails/application.rb
+++ b/railties/lib/rails/application.rb
@@ -178,7 +178,7 @@ module Rails
       railties.all { |r| initializers += r.initializers }
       initializers += super
       initializers += Finisher.initializers_for(self)
-      Collection.new(initializers)
+      initializers
     end
 
   protected
diff --git a/railties/lib/rails/initializable.rb b/railties/lib/rails/initializable.rb
index 78f9eaf393..46b3a02b22 100644
--- a/railties/lib/rails/initializable.rb
+++ b/railties/lib/rails/initializable.rb
@@ -58,7 +58,7 @@ module Rails
 
     module ClassMethods
       def initializers
-        @initializers ||= []
+        @initializers ||= Collection.new
       end
 
       def initializers_chain
-- 
cgit v1.2.3