aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorSteve Klabnik <steve@steveklabnik.com>2012-11-26 10:33:06 -0800
committerSteve Klabnik <steve@steveklabnik.com>2012-11-26 10:41:20 -0800
commit1a876f622865979ea6415d913adface70716e458 (patch)
treeab9fd1a6db1f85d2e941ae76ecdf39f017021159 /actionpack/CHANGELOG.md
parent51676652a3568ad09b06385564de4fdcb13af05e (diff)
downloadrails-1a876f622865979ea6415d913adface70716e458.tar.gz
rails-1a876f622865979ea6415d913adface70716e458.tar.bz2
rails-1a876f622865979ea6415d913adface70716e458.zip
Add i18n scope to disance_of_time_in_words.
This is a backport of rails/rails#7997.
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md3
1 files changed, 2 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index e060937fac..51518684d7 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,7 +1,8 @@
## Rails 3.2.10 (unreleased) ##
-* Fix side effect of `url_for` changing the `:controller` string option. [Backport #6003]
+* Add i18n scope to disance_of_time_in_words. [Backport #7997] *Steve Klabnik*
+* Fix side effect of `url_for` changing the `:controller` string option. [Backport #6003]
Before:
controller = '/projects'