aboutsummaryrefslogtreecommitdiffstats
path: root/railties/Rakefile
diff options
context:
space:
mode:
authorMikel Lindsaar <raasdnil@gmail.com>2010-02-02 10:51:19 +1100
committerMikel Lindsaar <raasdnil@gmail.com>2010-02-02 10:51:19 +1100
commitd1eed079e1338249aa3b2881d07029ac4e71f4ed (patch)
tree18088ca9388e1b7bd27fffea8cb41fa52b618c34 /railties/Rakefile
parentddf2b4add33d5e54c5f5e7adacadbb50d3fa7b52 (diff)
parentb9edb0c60c11025311fb06f2e60b3354f1b6cb09 (diff)
downloadrails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.tar.gz
rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.tar.bz2
rails-d1eed079e1338249aa3b2881d07029ac4e71f4ed.zip
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'railties/Rakefile')
-rw-r--r--railties/Rakefile5
1 files changed, 1 insertions, 4 deletions
diff --git a/railties/Rakefile b/railties/Rakefile
index b8f5e81b85..ea0b8ef8fb 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -1,7 +1,4 @@
-begin
- require File.expand_path('../../vendor/gems/environment', __FILE__)
-rescue LoadError
-end
+require File.expand_path('../../load_paths', __FILE__)
require 'rake'
require 'rake/testtask'