aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2012-04-24 06:36:54 -0700
committerJeremy Kemper <jeremy@bitsweat.net>2012-04-24 06:36:54 -0700
commitf7ddbaada95cddd7acb3166110071de29b17f51a (patch)
tree237989eb1ca94018d59a57d84d4a16abf5d0e037
parent10540e23bc79056857abe85932e5065c28c815ea (diff)
parent42b8bd59695b406e20f57fd987ba8b9833e48d75 (diff)
downloadrails-f7ddbaada95cddd7acb3166110071de29b17f51a.tar.gz
rails-f7ddbaada95cddd7acb3166110071de29b17f51a.tar.bz2
rails-f7ddbaada95cddd7acb3166110071de29b17f51a.zip
Merge pull request #5956 from arunagw/mocha_upgrade
Upgrading to Mocha 0.11.2 to fix Object#method override
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index ada3f5e19f..c1486b725d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -29,7 +29,7 @@ end
gem 'uglifier', '>= 1.0.3', :require => false
gem 'rake', '>= 0.8.7'
-gem 'mocha', '>= 0.9.8'
+gem 'mocha', '>= 0.11.2'
group :doc do
# The current sdoc cannot generate GitHub links due