diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-26 10:14:57 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-08-26 10:15:17 -0700 |
| commit | e8b525f16906458001fb1d10ed84d787760f19f3 (patch) | |
| tree | 3a8470accd399fe833aba42c3e024eb18e1f9258 /activerecord | |
| parent | 4a4dcb505952458c896fe354ed5ce066b13a2bf1 (diff) | |
| download | rails-e8b525f16906458001fb1d10ed84d787760f19f3.tar.gz rails-e8b525f16906458001fb1d10ed84d787760f19f3.tar.bz2 rails-e8b525f16906458001fb1d10ed84d787760f19f3.zip | |
stop messing with the load path, load path should be adjusted in the test task
Diffstat (limited to 'activerecord')
| -rw-r--r-- | activerecord/lib/active_record.rb | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/activerecord/lib/active_record.rb b/activerecord/lib/active_record.rb index 511d402ee5..132dc12680 100644 --- a/activerecord/lib/active_record.rb +++ b/activerecord/lib/active_record.rb @@ -21,13 +21,6 @@ # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #++ - -activesupport_path = File.expand_path('../../../activesupport/lib', __FILE__) -$:.unshift(activesupport_path) if File.directory?(activesupport_path) && !$:.include?(activesupport_path) - -activemodel_path = File.expand_path('../../../activemodel/lib', __FILE__) -$:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include?(activemodel_path) - require 'active_support' require 'active_support/i18n' require 'active_model' |