aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorOscar Del Ben <info@oscardelben.com>2012-04-25 15:43:29 +0200
committerOscar Del Ben <info@oscardelben.com>2012-04-25 15:43:29 +0200
commit4179141a012c84afa4756aa565aca3a07e4693fa (patch)
treebaf0a7c97fda49455408ee86b73272911acd14f8 /Gemfile
parentee4e7125a61c703332a8d591a0aee917ba828e62 (diff)
parent4a3ce153f1e05c9c590e9ee74e818649336d929f (diff)
downloadrails-4179141a012c84afa4756aa565aca3a07e4693fa.tar.gz
rails-4179141a012c84afa4756aa565aca3a07e4693fa.tar.bz2
rails-4179141a012c84afa4756aa565aca3a07e4693fa.zip
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'Gemfile')
-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