aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Patterson <aaron.patterson@gmail.com>2013-05-16 15:52:53 -0700
committerAaron Patterson <aaron.patterson@gmail.com>2013-05-16 15:52:53 -0700
commit10b538c2aa1f15a1859c74644d90376b81c42645 (patch)
tree7e388252b24a7e2fe536c8e5def77414aaa18203
parentba0695f48a28d34a9ee4d8da7ec61e15ce90a910 (diff)
parent632f215da07120d9f634708986c4cbac6754baf0 (diff)
downloadrails-10b538c2aa1f15a1859c74644d90376b81c42645.tar.gz
rails-10b538c2aa1f15a1859c74644d90376b81c42645.tar.bz2
rails-10b538c2aa1f15a1859c74644d90376b81c42645.zip
Merge pull request #10656 from zenspider/fix_mocha_back
Mocha 0.14.0 was released with MT5 support. Switch back to gem
-rw-r--r--Gemfile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index cbdc5c5a3e..d1fa0c2a1d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,7 @@ source 'https://rubygems.org'
gemspec
-gem 'mocha', git: 'https://github.com/freerange/mocha', require: false
+gem 'mocha', '~> 0.14'
gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails', '~> 2.2.0'