diff options
| author | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
|---|---|---|
| committer | Vijay Dev <vijaydev.cse@gmail.com> | 2012-09-28 23:17:07 +0530 |
| commit | 955a72c692a4298d238cc2e6353b9874099203f1 (patch) | |
| tree | 2a05fecd15526cd0013c22e45825be1aca4844d9 /railties/Rakefile | |
| parent | 77fbe1c0199567486c422fdf5cce49f2c11fc953 (diff) | |
| parent | cf3e760b87c49470c9a26ab3e2da67602474be1f (diff) | |
| download | rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.gz rails-955a72c692a4298d238cc2e6353b9874099203f1.tar.bz2 rails-955a72c692a4298d238cc2e6353b9874099203f1.zip | |
Merge branch 'master' of github.com:lifo/docrails
Conflicts:
actionpack/lib/action_view/helpers/asset_tag_helper.rb
Diffstat (limited to 'railties/Rakefile')
| -rw-r--r-- | railties/Rakefile | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/railties/Rakefile b/railties/Rakefile index 993ba840ff..8576275aea 100644 --- a/railties/Rakefile +++ b/railties/Rakefile @@ -8,9 +8,6 @@ require 'rbconfig' task :default => :test task :test => 'test:isolated' -## This is required until the regular test task -## below passes. It's not ideal, but at least -## we can see the failures namespace :test do task :isolated do dir = ENV["TEST_DIR"] || "**" |