Permalink
Browse files

Use new mocha version and add changelog entry for #8180

  • Loading branch information...
1 parent 395d6b4 commit c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd @carlosantoniodasilva carlosantoniodasilva committed Nov 13, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −1 Gemfile
  2. +2 −0 activesupport/CHANGELOG.md
View
@@ -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'
@@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* Simplify mocha integration and remove monkey-patches, bumping mocha to 0.13.0. *James Mead*
+
* `#as_json` isolates options when encoding a hash.
Fix #8182

0 comments on commit c940aa6

Please sign in to comment.