aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2007-02-04 20:44:45 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2007-02-04 20:44:45 +0000
commit8f614a80e725228c0cc0c03fd731c6cbad0ffcb7 (patch)
tree51453b2b1749f65d715cfe5e86e80301384f632d /actionpack
parent19fbb31464da45ac0935b3db193305f18e245ba9 (diff)
downloadrails-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 'actionpack')
-rwxr-xr-xactionpack/lib/action_controller.rb2
-rw-r--r--actionpack/test/controller/assert_select_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller.rb b/actionpack/lib/action_controller.rb
index 90c23604db..4fb8542382 100755
--- a/actionpack/lib/action_controller.rb
+++ b/actionpack/lib/action_controller.rb
@@ -30,7 +30,7 @@ unless defined?(ActiveSupport)
require 'active_support'
rescue LoadError
require 'rubygems'
- require_gem 'activesupport'
+ gem 'activesupport'
end
end
diff --git a/actionpack/test/controller/assert_select_test.rb b/actionpack/test/controller/assert_select_test.rb
index 7056bfa08b..f3b525ab92 100644
--- a/actionpack/test/controller/assert_select_test.rb
+++ b/actionpack/test/controller/assert_select_test.rb
@@ -13,7 +13,7 @@ unless defined?(ActionMailer)
require 'action_mailer'
rescue LoadError
require 'rubygems'
- require_gem 'actionmailer'
+ gem 'actionmailer'
end
end