aboutsummaryrefslogtreecommitdiffstats
path: root/railties/Rakefile
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-02-23 17:31:17 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-02-23 17:31:17 -0800
commit24ab5665b2f12a589e96a4b742cc49c08bf0e9df (patch)
treecbc703c96affe65fe8f0b24c6b6241286c820ba8 /railties/Rakefile
parent5e2bd08023344f3fd4675e80203a10967ffe9000 (diff)
downloadrails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.gz
rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.tar.bz2
rails-24ab5665b2f12a589e96a4b742cc49c08bf0e9df.zip
Revert "Fix test load paths for those not using bundler"
This reverts commit eec2d301d4ce9df9c71c1a5aa63053eb970b6818. This commit broke tests. You cannot have a file called "bundler" on the load path.
Diffstat (limited to 'railties/Rakefile')
-rw-r--r--railties/Rakefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index d4b446bc24..f32a794544 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,4 +1,4 @@
-require File.expand_path('../../bundler', __FILE__)
+require File.expand_path('../../load_paths', __FILE__)
require 'rake'
require 'rake/testtask'