diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-15 21:54:46 +0100 |
| commit | 879493c35fd8d9e12e5cf3e56cd67ff07c3345c5 (patch) | |
| tree | 9615859e1d9a52f71da444b0b7359817bb6acc50 /railties/lib/rails/plugin | |
| parent | d6ecce66f4e125531875006eea8022b73fe135b5 (diff) | |
| parent | fc02eabf296d6edb74a95174c7322293a54c9492 (diff) | |
| download | rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.gz rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.tar.bz2 rails-879493c35fd8d9e12e5cf3e56cd67ff07c3345c5.zip | |
Merge commit 'mainstream/master'
Conflicts:
actionmailer/lib/action_mailer/base.rb
Diffstat (limited to 'railties/lib/rails/plugin')
| -rw-r--r-- | railties/lib/rails/plugin/locator.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/railties/lib/rails/plugin/locator.rb b/railties/lib/rails/plugin/locator.rb index fd7de4ee28..f06a51a572 100644 --- a/railties/lib/rails/plugin/locator.rb +++ b/railties/lib/rails/plugin/locator.rb @@ -78,11 +78,12 @@ module Rails # a <tt>rails/init.rb</tt> file. class GemLocator < Locator def plugins - specs = initializer.configuration.gems.map(&:specification) - specs + Gem.loaded_specs.values.select do |spec| + specs = initializer.configuration.gems.map(&:specification) + specs += Gem.loaded_specs.values.select do |spec| spec.loaded_from && # prune stubs File.exist?(File.join(spec.full_gem_path, "rails", "init.rb")) end + specs.compact! require "rubygems/dependency_list" |