diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2010-06-24 02:13:08 -0700 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2010-06-24 02:13:08 -0700 |
| commit | 9f7874ac419f626a6a5157c757669a8b16770ae4 (patch) | |
| tree | a849c3d7a86efafa2c8189bb0a74aaa8fe366acc /railties | |
| parent | cdb8609c64ed7db7ea91cdcd4bcb4b400f7dfe07 (diff) | |
| download | rails-9f7874ac419f626a6a5157c757669a8b16770ae4.tar.gz rails-9f7874ac419f626a6a5157c757669a8b16770ae4.tar.bz2 rails-9f7874ac419f626a6a5157c757669a8b16770ae4.zip | |
Move Collection responsibility from application to initializable
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/lib/rails/application.rb | 2 | ||||
| -rw-r--r-- | 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 |