diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-20 16:41:01 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-03-20 16:41:01 -0700 |
| commit | d1577cfe3d7f01f2876e3cbe682065012246697c (patch) | |
| tree | 0fc5512f74f2c4938c0853d7444fc7112a695c8a /actionpack/CHANGELOG.md | |
| parent | 38d06478614adcf68a45947cb162c3152e2d7bb1 (diff) | |
| parent | 2c8f34995378e4a18711cf5f947e8465227d3748 (diff) | |
| download | rails-d1577cfe3d7f01f2876e3cbe682065012246697c.tar.gz rails-d1577cfe3d7f01f2876e3cbe682065012246697c.tar.bz2 rails-d1577cfe3d7f01f2876e3cbe682065012246697c.zip | |
Merge branch '3-2-stable' into fredwu-slow_view_loading_fix
* 3-2-stable:
Merge pull request #9802 from newsline/fix-broken-action-missing
Remove bad changelog entry from AR [ci skip]
Wrong exception is occured when raising no translatable exception
Don't crash exception translation w/ nil result attribute.
Conflicts:
actionpack/CHANGELOG.md
Diffstat (limited to 'actionpack/CHANGELOG.md')
| -rw-r--r-- | actionpack/CHANGELOG.md | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 19511225a0..9c872e5dec 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -6,6 +6,11 @@ *Fred Wu* +* Fixed `ActionController#action_missing` not being called. + Fixes #9799. + + *Janko Luin* + * `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. |