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 /activerecord | |
| 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 'activerecord')
| -rw-r--r-- | activerecord/benchmarks/benchmark.rb | 2 | ||||
| -rwxr-xr-x | activerecord/lib/active_record.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/benchmarks/benchmark.rb b/activerecord/benchmarks/benchmark.rb index 241d915208..de390c11b2 100644 --- a/activerecord/benchmarks/benchmark.rb +++ b/activerecord/benchmarks/benchmark.rb @@ -1,7 +1,7 @@ $:.unshift(File.dirname(__FILE__) + '/../lib') if ARGV[2] require 'rubygems' - require_gem 'activerecord', ARGV[2] + gem 'activerecord', ARGV[2] else require 'active_record' end diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 4bd5b6a1af..c4a228053b 100755 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -30,7 +30,7 @@ unless defined?(ActiveSupport) require 'active_support' rescue LoadError require 'rubygems' - require_gem 'activesupport' + gem 'activesupport' end end |