Merged r10155 from trunk to 1.4-stable

Gemfile: pin mocha version 0.12.1.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.4-stable@10168 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA committed 2012-08-07 23:21:45 +00:00
1 parent a82a16378f
commit a92ef237d3
1 file changed
+1 -1
+1 -1
View File
@@ -74,7 +74,7 @@ group :test do
# Shoulda does not work nice on Ruby 1.9.3 and seems to need test-unit explicitely. # Shoulda does not work nice on Ruby 1.9.3 and seems to need test-unit explicitely.
gem "test-unit", :platforms => [:mri_19] gem "test-unit", :platforms => [:mri_19]
gem "edavis10-object_daddy", :require => "object_daddy" gem "edavis10-object_daddy", :require => "object_daddy"
gem "mocha" gem "mocha", "0.12.1"
end end
local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local") local_gemfile = File.join(File.dirname(__FILE__), "Gemfile.local")