diff options
| author | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 08:49:18 -0200 |
|---|---|---|
| committer | Carlos Antonio da Silva <carlosantoniodasilva@gmail.com> | 2012-11-13 08:57:04 -0200 |
| commit | c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd (patch) | |
| tree | cad83670ede53554273049fe0d1934639076432a | |
| parent | 395d6b43b8857ba1e8bbeec941576b4740c400e4 (diff) | |
| download | rails-c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd.tar.gz rails-c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd.tar.bz2 rails-c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd.zip | |
Use new mocha version and add changelog entry for #8180
| -rw-r--r-- | Gemfile | 2 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 |
2 files changed, 3 insertions, 1 deletions
@@ -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' diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 24989fc244..2bbc41296f 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -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 |