diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2008-05-06 10:04:25 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2008-05-06 10:04:25 +0100 |
| commit | 4a0118d7278687b534edf1e1184d6858cb4d29b8 (patch) | |
| tree | b1e776b31ae4cde6f0cd0c29be5b9f4fdfcfdaaa /railties/lib | |
| parent | 2037cdda0e82bb77676ecdd3c312a22e29a2b070 (diff) | |
| parent | 04f52219f11944e50555dc59917c73c99581dac0 (diff) | |
| download | rails-4a0118d7278687b534edf1e1184d6858cb4d29b8.tar.gz rails-4a0118d7278687b534edf1e1184d6858cb4d29b8.tar.bz2 rails-4a0118d7278687b534edf1e1184d6858cb4d29b8.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/plugin/locator.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/lib/rails/plugin/locator.rb b/railties/lib/rails/plugin/locator.rb index 6e6d2201a1..fd7de4ee28 100644 --- a/railties/lib/rails/plugin/locator.rb +++ b/railties/lib/rails/plugin/locator.rb @@ -78,7 +78,8 @@ module Rails # a <tt>rails/init.rb</tt> file. class GemLocator < Locator def plugins - 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 |