diff options
| author | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
|---|---|---|
| committer | Michael Koziarski <michael@koziarski.com> | 2008-05-06 20:53:56 +1200 |
| commit | a08004a9a7d4c93c39f9693f6406ecb70d6a38c0 (patch) | |
| tree | 531584bf588a3b288ab14a8e16540ab947a0ec45 /railties | |
| parent | c26d10563eaa29961ae895a9fbe3afae7d24a9b1 (diff) | |
| parent | 04f52219f11944e50555dc59917c73c99581dac0 (diff) | |
| download | rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.gz rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.tar.bz2 rails-a08004a9a7d4c93c39f9693f6406ecb70d6a38c0.zip | |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/lib/rails/plugin/locator.rb | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index a1f9db28e0..f52206d4d3 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix bug where plugin init.rb files from frozen gem specs weren't being run. (pjb3) [#122 state:resolved] + * Made the location of the routes file configurable with config.routes_configuration_file (Scott Fleckenstein) [#88] * Rails Edge info returns the latest git commit hash [Francesc Esplugas] 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 |