diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-30 19:34:33 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2012-03-30 19:34:33 -0300 |
| commit | 69465d9f7cf1a2b58520a2382694e465cd7762de (patch) | |
| tree | 343a7c4bb428b79e84cb85625e04696b47cd874a /actionpack | |
| parent | dffbb521a0d00c8673a3ad6e0e8ff526f32daf4e (diff) | |
| parent | 45d6cd94b3ef2ec77166def41f29188445b35608 (diff) | |
| download | rails-69465d9f7cf1a2b58520a2382694e465cd7762de.tar.gz rails-69465d9f7cf1a2b58520a2382694e465cd7762de.tar.bz2 rails-69465d9f7cf1a2b58520a2382694e465cd7762de.zip | |
Merge branch '3-2-3' into 3-2-stable
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG.md | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_pack/version.rb | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index 87dd7a9959..566b6af378 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -1,5 +1,9 @@ ## Rails 3.2.3 (unreleased) ## +* Fix #5632, render :inline set the proper rendered format. *Santiago Pastorino* + +* Fix textarea rendering when using plugins like HAML. Such plugins encode the first newline character in the content. This issue was introduced in https://github.com/rails/rails/pull/5191 *James Coleman* + * Remove the leading \n added by textarea on assert_select. *Santiago Pastorino* * Add `config.action_view.embed_authenticity_token_in_remote_forms` (defaults to true) which allows to set if authenticity token will be included by default in remote forms. If you change it to false, you can still force authenticity token by passing `:authenticity_token => true` in form options *Piotr Sarnacki* diff --git a/actionpack/lib/action_pack/version.rb b/actionpack/lib/action_pack/version.rb index 00e9277c9d..4d1f19ed13 100644 --- a/actionpack/lib/action_pack/version.rb +++ b/actionpack/lib/action_pack/version.rb @@ -3,7 +3,7 @@ module ActionPack MAJOR = 3 MINOR = 2 TINY = 3 - PRE = "rc1" + PRE = nil STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.') end |