diff options
| author | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-08-27 11:39:06 +0200 |
|---|---|---|
| committer | Hongli Lai (Phusion) <hongli@phusion.nl> | 2008-08-27 11:39:06 +0200 |
| commit | 08704c442d15b16511214731dd94108b737ef407 (patch) | |
| tree | d92d53f39245256dea6aa38a11500938adccf777 /railties/lib/rails | |
| parent | 920ad94598a9b90d048cb7cb19a34d7cb9e80392 (diff) | |
| parent | 5db2f199aba9aa8d00adefa8237922ad684aca03 (diff) | |
| download | rails-08704c442d15b16511214731dd94108b737ef407.tar.gz rails-08704c442d15b16511214731dd94108b737ef407.tar.bz2 rails-08704c442d15b16511214731dd94108b737ef407.zip | |
Merge branch 'master' of git@github.com:lifo/docrails
Diffstat (limited to 'railties/lib/rails')
| -rw-r--r-- | railties/lib/rails/gem_dependency.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/lib/rails/gem_dependency.rb b/railties/lib/rails/gem_dependency.rb index f8d97840c1..471e03fa5f 100644 --- a/railties/lib/rails/gem_dependency.rb +++ b/railties/lib/rails/gem_dependency.rb @@ -58,7 +58,7 @@ module Rails def load return if @loaded || @load_paths_added == false - require(@lib || @name) + require(@lib || @name) unless @lib == false @loaded = true rescue LoadError puts $!.to_s |