aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-26 10:49:24 -0800
committerRafael Mendonça França <rafaelmfranca@gmail.com>2012-11-26 10:49:24 -0800
commit586bc593c7ef3a1e7a9aa01dde1cf5d908f0e68b (patch)
tree2fa052fc985480187ca984a34f0cbf7b4a9bf031
parent2cab6a1b5ae012bbd0a33b589d4b86b2bcb88edd (diff)
parent512a8c7363d23c3f84eccbf9b1ca128e583c9aab (diff)
downloadrails-586bc593c7ef3a1e7a9aa01dde1cf5d908f0e68b.tar.gz
rails-586bc593c7ef3a1e7a9aa01dde1cf5d908f0e68b.tar.bz2
rails-586bc593c7ef3a1e7a9aa01dde1cf5d908f0e68b.zip
Merge pull request #8323 from steveklabnik/changelog_7997
Add changelog for #7997.
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 0c47934c1e..9301ba1d51 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* Add i18n scope to disance_of_time_in_words. *Steve Klabnik*
+
* `assert_template`:
- is no more passing with empty string.
- is now validating option keys. It accepts: `:layout`, `:partial`, `:locals` and `:count`.