aboutsummaryrefslogtreecommitdiffstats
path: root/railties/environments
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 16:15:02 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2005-02-15 16:15:02 +0000
commitca175ed7c9b357fdb40e7f3e31cd0283354fd54c (patch)
treec6fa319e91709048df6a40af8a6fe19f932b85b5 /railties/environments
parentdc3d6eb9b4aaed051dd6d5a5a07f6c66b72da4c4 (diff)
downloadrails-ca175ed7c9b357fdb40e7f3e31cd0283354fd54c.tar.gz
rails-ca175ed7c9b357fdb40e7f3e31cd0283354fd54c.tar.bz2
rails-ca175ed7c9b357fdb40e7f3e31cd0283354fd54c.zip
All libraries should link against the independent active support
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@625 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'railties/environments')
-rw-r--r--railties/environments/shared.rb1
-rw-r--r--railties/environments/shared_for_gem.rb1
2 files changed, 2 insertions, 0 deletions
diff --git a/railties/environments/shared.rb b/railties/environments/shared.rb
index 6064e18b03..bccc9c3e21 100644
--- a/railties/environments/shared.rb
+++ b/railties/environments/shared.rb
@@ -30,6 +30,7 @@ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(di
# Require Rails libraries.
+require 'active_support'
require 'active_record'
require 'action_controller'
require 'action_mailer'
diff --git a/railties/environments/shared_for_gem.rb b/railties/environments/shared_for_gem.rb
index 948b5e47eb..f58d974cc1 100644
--- a/railties/environments/shared_for_gem.rb
+++ b/railties/environments/shared_for_gem.rb
@@ -25,6 +25,7 @@ ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(di
# Require Rails gems.
require 'rubygems'
+require_gem 'activesupport'
require_gem 'activerecord'
require_gem 'actionpack'
require_gem 'actionmailer'