diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-04 20:44:45 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2007-02-04 20:44:45 +0000 |
| commit | 8f614a80e725228c0cc0c03fd731c6cbad0ffcb7 (patch) | |
| tree | 51453b2b1749f65d715cfe5e86e80301384f632d /railties | |
| parent | 19fbb31464da45ac0935b3db193305f18e245ba9 (diff) | |
| download | rails-8f614a80e725228c0cc0c03fd731c6cbad0ffcb7.tar.gz rails-8f614a80e725228c0cc0c03fd731c6cbad0ffcb7.tar.bz2 rails-8f614a80e725228c0cc0c03fd731c6cbad0ffcb7.zip | |
Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6119 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/CHANGELOG | 2 | ||||
| -rw-r--r-- | railties/environments/boot.rb | 4 | ||||
| -rw-r--r-- | railties/lib/rails_generator.rb | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/railties/CHANGELOG b/railties/CHANGELOG index f3f78d0606..2b7ef8f8dd 100644 --- a/railties/CHANGELOG +++ b/railties/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Fix gem deprecation warnings, which also means depending on RubyGems 0.9.0+ [Chad Fowler] + * Plugins may be symlinked in vendor/plugins. #4245 [brandon, progrium@gmail.com] * Resource generator depends on the model generator rather than duplicating it. #7269 [bscofield] diff --git a/railties/environments/boot.rb b/railties/environments/boot.rb index 128fe76459..1e2a641823 100644 --- a/railties/environments/boot.rb +++ b/railties/environments/boot.rb @@ -26,7 +26,7 @@ unless defined?(Rails::Initializer) rails_gem = Gem.cache.search('rails', "~>#{version}.0").sort_by { |g| g.version.version }.last if rails_gem - require_gem "rails", "=#{rails_gem.version.version}" + gem "rails", "=#{rails_gem.version.version}" require rails_gem.full_gem_path + '/lib/initializer' else STDERR.puts %(Cannot find gem for Rails ~>#{version}.0: @@ -36,7 +36,7 @@ unless defined?(Rails::Initializer) exit 1 end else - require_gem "rails" + gem "rails" require 'initializer' end end diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index 9c587c9552..9f0ffc1562 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -28,7 +28,7 @@ begin require 'active_support' rescue LoadError require 'rubygems' - require_gem 'activesupport' + gem 'activesupport' end require 'rails_generator/base' |