aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorhoffm <m@hof.fm>2013-02-20 16:15:59 -0500
committerBrian Samson <brian@briansamson.com>2013-03-19 09:30:50 -0500
commit1b12d08a0f8489f0f3970f6d5e40ed119127c856 (patch)
treec01136dfb1696551640387bb0019bd23d903f29b /actionpack/CHANGELOG.md
parent2cf38aebacaf78260848a54bfbb5bf5a9b627598 (diff)
downloadrails-1b12d08a0f8489f0f3970f6d5e40ed119127c856.tar.gz
rails-1b12d08a0f8489f0f3970f6d5e40ed119127c856.tar.bz2
rails-1b12d08a0f8489f0f3970f6d5e40ed119127c856.zip
Backport #9347 to rails 3.2
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md14
1 files changed, 14 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 80c0def5b3..8c7e3327f3 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,19 @@
## unreleased ##
+* `ActiveSupport::NumberHelper#number_to_human` returns the number unaltered when
+ the units hash does not contain the needed key, e.g. when the number provided is less
+ than the largest key proivided.
+
+ Examples:
+
+ number_to_human(123, :units => {}) # => 123
+ number_to_human(123, :units => {:thousand => 'k'}) # => 123
+
+ Fixes #9269.
+ Backport #9347.
+
+ *Michael Hoffman*
+
* Include I18n locale fallbacks in view lookup.
Fixes GH#3512.