Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Expanded the requires again and included the load paths

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
commit 30f401114e753ed6676201a20088470b940ee35a 1 parent 476f26e
David Heinemeier Hansson dhh authored
Showing with 21 additions and 2 deletions.
  1. +21 −2 railties/environments/environment.rb
23 railties/environments/environment.rb
View
@@ -11,7 +11,21 @@
# Followed by the standard includes.
ADDITIONAL_LOAD_PATHS.concat %w(
- app app/models app/controllers app/helpers app/apis config components lib vendor
+ app
+ app/models
+ app/controllers
+ app/helpers
+ app/apis
+ config
+ components
+ lib
+ vendor
+ vendor/rails/railties/lib
+ vendor/rails/actionpack/lib
+ vendor/rails/activesupport/lib
+ vendor/rails/activerecord/lib
+ vendor/rails/actionmailer/lib
+ vendor/rails/actionwebservice/lib
).map { |dir| "#{RAILS_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) }
# Prepend to $LOAD_PATH
@@ -31,7 +45,12 @@
rails_files.each { |f| require f }
else
require 'rubygems'
- %w( activesupport activerecord actionpack actionmailer actionwebservice rails ).each { |gem| require_gem(gem) }
+ require_gem 'activesupport'
+ require_gem 'activerecord'
+ require_gem 'actionpack'
+ require_gem 'actionmailer'
+ require_gem 'actionwebservice'
+ require_gem 'rails'
end
# Environment-specific configuration.
Please sign in to comment.
Something went wrong with that request. Please try again.