diff options
| author | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 16:15:02 +0000 |
|---|---|---|
| committer | David Heinemeier Hansson <david@loudthinking.com> | 2005-02-15 16:15:02 +0000 |
| commit | ca175ed7c9b357fdb40e7f3e31cd0283354fd54c (patch) | |
| tree | c6fa319e91709048df6a40af8a6fe19f932b85b5 /railties | |
| parent | dc3d6eb9b4aaed051dd6d5a5a07f6c66b72da4c4 (diff) | |
| download | rails-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')
| -rw-r--r-- | railties/environments/shared.rb | 1 | ||||
| -rw-r--r-- | railties/environments/shared_for_gem.rb | 1 | ||||
| -rw-r--r-- | railties/lib/dispatcher.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator.rb | 3 | ||||
| -rw-r--r-- | railties/lib/rails_generator/base.rb | 2 | ||||
| -rw-r--r-- | railties/lib/rails_generator/options.rb | 1 |
6 files changed, 4 insertions, 6 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' diff --git a/railties/lib/dispatcher.rb b/railties/lib/dispatcher.rb index 007b407005..74de93713c 100644 --- a/railties/lib/dispatcher.rb +++ b/railties/lib/dispatcher.rb @@ -24,7 +24,7 @@ require 'breakpoint' class Dispatcher - class <<self + class << self def dispatch(cgi = CGI.new, session_options = ActionController::CgiRequest::DEFAULT_SESSION_OPTIONS) begin prepare_application diff --git a/railties/lib/rails_generator.rb b/railties/lib/rails_generator.rb index edfe86efc4..3e7f459345 100644 --- a/railties/lib/rails_generator.rb +++ b/railties/lib/rails_generator.rb @@ -23,8 +23,7 @@ $:.unshift(File.dirname(__FILE__)) -require 'active_support/core_ext' - +require 'active_support' require 'rails_generator/base' require 'rails_generator/lookup' diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb index 54b4b32fd3..eafc99728c 100644 --- a/railties/lib/rails_generator/base.rb +++ b/railties/lib/rails_generator/base.rb @@ -1,5 +1,3 @@ -require 'active_support/class_attribute_accessors' -require 'active_support/inflector' require File.dirname(__FILE__) + '/options' require File.dirname(__FILE__) + '/manifest' require File.dirname(__FILE__) + '/spec' diff --git a/railties/lib/rails_generator/options.rb b/railties/lib/rails_generator/options.rb index 80af7fedf9..287605c852 100644 --- a/railties/lib/rails_generator/options.rb +++ b/railties/lib/rails_generator/options.rb @@ -1,5 +1,4 @@ require 'optparse' -require 'active_support/class_inheritable_attributes' module Rails module Generator |