Merge pull request #10675 from prathamesh-sonpatki/dont-auto-require-…

…mocha Don't autorequire mocha to avoid deprecation warnings
rails · May 18, 2013 · dcff874 · dcff874
2 parents 1ff5341 + 2b66b32
commit dcff874
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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'