aboutsummaryrefslogtreecommitdiffstats
path: root/railties/lib
diff options
context:
space:
mode:
authorrick <rick@spacemonkey.local>2008-05-05 23:55:10 -0700
committerrick <rick@spacemonkey.local>2008-05-05 23:55:10 -0700
commit9c2657aa96d3a8f19602ded748e558b0531c1132 (patch)
tree09c4f9eb8cae7d8e1dd1971e81672b9f88d28b51 /railties/lib
parent37599d16f2374179ebf001aeb79ff121e3d67519 (diff)
parente792d4ab70448f79142fdf492390682ff5ea6398 (diff)
downloadrails-9c2657aa96d3a8f19602ded748e558b0531c1132.tar.gz
rails-9c2657aa96d3a8f19602ded748e558b0531c1132.tar.bz2
rails-9c2657aa96d3a8f19602ded748e558b0531c1132.zip
Merge commit 'e792d4ab70448f79142fdf492390682ff5ea6398'
Diffstat (limited to 'railties/lib')
-rw-r--r--railties/lib/rails/plugin/locator.rb3
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