Changeset 627
- Timestamp:
- 02/15/05 16:21:56 (4 years ago)
- Files:
-
- trunk/actionpack/lib/action_controller/dependencies.rb (modified) (1 diff)
- trunk/activesupport/lib/active_support.rb (added)
- trunk/railties/environments/shared_for_gem.rb (modified) (1 diff)
- trunk/railties/environments/shared.rb (modified) (1 diff)
- trunk/railties/lib/rails_generator.rb (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/actionpack/lib/action_controller/dependencies.rb
r579 r627 87 87 end 88 88 end 89 90 Controllers = Dependencies::LoadingModule.new(File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers'))) if defined?(RAILS_ROOT) trunk/railties/environments/shared_for_gem.rb
r625 r627 38 38 ActiveRecord::Base.establish_connection 39 39 40 Controllers = Dependencies::LoadingModule.new(File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')))41 42 40 43 41 # Configure defaults if the included environment did not. trunk/railties/environments/shared.rb
r625 r627 42 42 ActiveRecord::Base.establish_connection 43 43 44 Controllers = Dependencies::LoadingModule.new(File.expand_path(File.join(RAILS_ROOT, 'app', 'controllers')))45 46 44 47 45 # Configure defaults if the included environment did not. trunk/railties/lib/rails_generator.rb
r625 r627 24 24 $:.unshift(File.dirname(__FILE__)) 25 25 26 require 'active_support' 26 begin 27 require 'active_support' 28 rescue LoadError 29 require 'rubygems' 30 require_gem 'activesupport' 31 end 27 32 28 33 require 'rails_generator/base'
