From a82a16378f0b2f8b11fc0a62735eea1af435c165 Mon Sep 17 00:00:00 2001
From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Tue, 31 Jul 2012 08:47:21 +0000
Subject: [PATCH] Merged r10137 from trunk to 1.4-stable (#10320, #10818)

Gemfile: prevent "rake db:migrate RAILS_ENV=test" causes exception on Ruby 1.9.3.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10139 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 Gemfile       | 2 ++
 doc/CHANGELOG | 1 +
 2 files changed, 3 insertions(+)

diff --git a/Gemfile b/Gemfile
index fdb7f8bd6..58f60706c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -71,6 +71,8 @@ end
 
 group :test do
   gem "shoulda", "~> 2.10.3"
+  # Shoulda does not work nice on Ruby 1.9.3 and seems to need test-unit explicitely.
+  gem "test-unit", :platforms => [:mri_19]
   gem "edavis10-object_daddy", :require => "object_daddy"
   gem "mocha"
 end
diff --git a/doc/CHANGELOG b/doc/CHANGELOG
index fec04fc19..85fdab901 100644
--- a/doc/CHANGELOG
+++ b/doc/CHANGELOG
@@ -6,6 +6,7 @@ http://www.redmine.org/
 
 == TBD v1.4.5
 
+* Defect #10818: Running rake in test environment causes exception
 * Defect #11192: Make repository identifier accept underscores
 * Defect #11307: Can't filter for negative numeric custom fields
 * Defect #11365: Attachment description length is not validated