Merge commit 'e792d4ab'

railties/lib/rails/plugin/locator.rb

@@ -78,7 +78,8 @@ def locate_plugins_under(base_path)
     # 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