aboutsummaryrefslogtreecommitdiffstats
path: root/Gemfile
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-13 08:49:18 -0200
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-13 08:57:04 -0200
commitc940aa6ed5d0ae3ca67e6c5067df29d759e48bcd (patch)
treecad83670ede53554273049fe0d1934639076432a /Gemfile
parent395d6b43b8857ba1e8bbeec941576b4740c400e4 (diff)
downloadrails-c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd.tar.gz
rails-c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd.tar.bz2
rails-c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd.zip
Use new mocha version and add changelog entry for #8180
Diffstat (limited to 'Gemfile')
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index b241cdc33c..cb8f85b0a3 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ gemspec
gem 'arel', github: 'rails/arel', branch: 'master'
-gem 'mocha', github: 'freerange/mocha', require: false
+gem 'mocha', '~> 0.13.0', require: false
gem 'rack-test', github: 'brynary/rack-test'
gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'