aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/CHANGELOG.md
diff options
context:
space:
mode:
authorCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-26 15:34:09 -0800
committerCarlos Antonio da Silva <carlosantoniodasilva@gmail.com>2012-11-26 15:34:09 -0800
commitfe4571259daab2738908da83b0c2c4387ba139e5 (patch)
treef3e09b588ae9cba565649552e2ebccdc9f098514 /actionpack/CHANGELOG.md
parent5658923daa2f2c7858f55844168e1872cc611766 (diff)
parent5d8faa683e230e6af54ac7616f98f3ae088e7682 (diff)
downloadrails-fe4571259daab2738908da83b0c2c4387ba139e5.tar.gz
rails-fe4571259daab2738908da83b0c2c4387ba139e5.tar.bz2
rails-fe4571259daab2738908da83b0c2c4387ba139e5.zip
Merge pull request #8329 from elia/fix-send-data-disposition-with-symbols-master
Accept symbols as #send_data :disposition value
Diffstat (limited to 'actionpack/CHANGELOG.md')
-rw-r--r--actionpack/CHANGELOG.md2
1 files changed, 2 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index 64cd03859d..a8ac9081ec 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -1,5 +1,7 @@
## Rails 4.0.0 (unreleased) ##
+* Accept symbols as #send_data :disposition value *Elia Schito*
+
* Add i18n scope to distance_of_time_in_words. *Steve Klabnik*
* `assert_template`: