From c940aa6ed5d0ae3ca67e6c5067df29d759e48bcd Mon Sep 17 00:00:00 2001
From: Carlos Antonio da Silva <carlosantoniodasilva@gmail.com>
Date: Tue, 13 Nov 2012 08:49:18 -0200
Subject: Use new mocha version and add changelog entry for #8180

---
 activesupport/CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'activesupport')

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
 
-- 
cgit v1.2.3