diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md index cd419b68f7..44d87878a4 100644 --- a/actionpack/CHANGELOG.md +++ b/actionpack/CHANGELOG.md @@ -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. diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md index 001cc21181..55f2148640 100644 --- a/actionview/CHANGELOG.md +++ b/actionview/CHANGELOG.md @@ -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: - + - For details see GH#32080 - *Sergey Prikhodko* * Don't enforce UTF-8 by default diff --git a/activemodel/CHANGELOG.md b/activemodel/CHANGELOG.md index 8a3578229a..b28c83e4ed 100644 --- a/activemodel/CHANGELOG.md +++ b/activemodel/CHANGELOG.md @@ -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* diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md index 227f93c6a1..325c4abfc8 100644 --- a/activerecord/CHANGELOG.md +++ b/activerecord/CHANGELOG.md @@ -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*