diff options
| author | TomK32 <tomk32@tomk32.de> | 2008-05-16 11:13:32 +0200 |
|---|---|---|
| committer | TomK32 <tomk32@tomk32.de> | 2008-05-16 11:13:32 +0200 |
| commit | fa0cca368f74119b561595cc6ca7454f7debdf6b (patch) | |
| tree | 85022a5047c4d8da55a981cc3c1b8cc65f1adcd8 /railties/lib/rails | |
| parent | f16c22040d5b66cb285fbd9a90858294376192bb (diff) | |
| parent | 4e2bc02163aa646ab1304b1b5bec98a7af8927f5 (diff) | |
| download | rails-fa0cca368f74119b561595cc6ca7454f7debdf6b.tar.gz rails-fa0cca368f74119b561595cc6ca7454f7debdf6b.tar.bz2 rails-fa0cca368f74119b561595cc6ca7454f7debdf6b.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/plugin/locator.rb | 5 | ||||
| -rw-r--r-- | railties/lib/rails/version.rb | 2 |
2 files changed, 4 insertions, 3 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" diff --git a/railties/lib/rails/version.rb b/railties/lib/rails/version.rb index da90645738..fea63beea9 100644 --- a/railties/lib/rails/version.rb +++ b/railties/lib/rails/version.rb @@ -2,7 +2,7 @@ module Rails module VERSION #:nodoc: MAJOR = 2 MINOR = 0 - TINY = 2 + TINY = 991 STRING = [MAJOR, MINOR, TINY].join('.') end |