Remove CHANGELOG entries which were backported to 5-2-stable

This commit is contained in:
Ryuta Kamizono 2018-02-28 20:45:35 +09:00
parent 42a16a4d65
commit 9dbc475454
4 changed files with 3 additions and 28 deletions

View File

@ -4,10 +4,5 @@
*Jeremy Daer*
* Add alias method `to_hash` to `to_h` for `cookies`.
Add alias method `to_h` to `to_hash` for `session`.
*Igor Kasyanchuk*
Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/actionpack/CHANGELOG.md) for previous changes.

View File

@ -2,23 +2,21 @@
* Enable select tag helper to mark `prompt` option as `selected` and/or `disabled` for `required`
field. Example:
select :post,
:category,
["lifestyle", "programming", "spiritual"],
{ selected: "", disabled: "", prompt: "Choose one" },
{ required: true }
Placeholder option would be selected and disabled. The HTML produced:
<select required="required" name="post[category]" id="post_category">
<option disabled="disabled" selected="selected" value="">Choose one</option>
<option value="lifestyle">lifestyle</option>
<option value="programming">programming</option>
<option value="spiritual">spiritual</option></select>
For details see GH#32080
*Sergey Prikhodko*
* Don't enforce UTF-8 by default

View File

@ -1,9 +1,5 @@
## Rails 6.0.0.alpha (Unreleased) ##
* Do not lose all multiple `:includes` with options in serialization.
*Mike Mangino*
* Rails 6 requires Ruby 2.4.1 or newer.
*Jeremy Daer*

View File

@ -1,19 +1,5 @@
## Rails 6.0.0.alpha (Unreleased) ##
* Fix `#columns_for_distinct` of MySQL and PostgreSQL to make
`ActiveRecord::FinderMethods#limited_ids_for` use correct primary key values
even if `ORDER BY` columns include other table's primary key.
Fixes #28364.
*Takumi Kagiyama*
* Make `reflection.klass` raise if `polymorphic?` not to be misused.
Fixes #31876.
*Ryuta Kamizono*
* Rails 6 requires Ruby 2.4.1 or newer.
*Jeremy Daer*