aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-18 05:46:19 -0700
committerRafael Mendonça França <rafaelmfranca@gmail.com>2013-05-18 05:46:19 -0700
commitdcff874189d16045d4fd8587bc4f0db9b37989de (patch)
tree4894d058717d698964f0fc36d68141f1c90daa22
parent1ff53413852db94476d4851e1535669b953c9393 (diff)
parent2b66b32a4cddfe37006f8e457d329f26aab477b0 (diff)
downloadrails-dcff874189d16045d4fd8587bc4f0db9b37989de.tar.gz
rails-dcff874189d16045d4fd8587bc4f0db9b37989de.tar.bz2
rails-dcff874189d16045d4fd8587bc4f0db9b37989de.zip
Merge pull request #10675 from prathamesh-sonpatki/dont-auto-require-mocha
Don't autorequire mocha to avoid deprecation warnings
-rw-r--r--Gemfile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Gemfile b/Gemfile
index d1fa0c2a1d..b0f91c6dac 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,7 +2,11 @@ source 'https://rubygems.org'
gemspec
-gem 'mocha', '~> 0.14'
+# This needs to be with require false as it is
+# loaded after loading the test library to
+# ensure correct loading order
+gem 'mocha', '~> 0.14', require: false
+
gem 'rack-cache', '~> 1.2'
gem 'bcrypt-ruby', '~> 3.0.0'
gem 'jquery-rails', '~> 2.2.0'