diff options
| author | Ryuta Kamizono <kamipo@gmail.com> | 2018-02-26 07:29:15 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-26 07:29:15 +0900 |
| commit | 065c1fae12ddfa2b3744d0e872f6b6c10912f2eb (patch) | |
| tree | ae5f4bd1f944eb44a601275f10a19f266c5f15ce | |
| parent | 3579876931381fd6abff99bd6e739169a8fcb489 (diff) | |
| parent | ae3e241b573b450fd9ce694a458ad942a8bd6b03 (diff) | |
| download | rails-065c1fae12ddfa2b3744d0e872f6b6c10912f2eb.tar.gz rails-065c1fae12ddfa2b3744d0e872f6b6c10912f2eb.tar.bz2 rails-065c1fae12ddfa2b3744d0e872f6b6c10912f2eb.zip | |
Merge pull request #32106 from bogdanvlviv/fix-rails-6_0_changelogs
Remove changelogs for Rails 6.0 since they were backported to `5-2-stable`
[ci skip]
| -rw-r--r-- | activestorage/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | activesupport/CHANGELOG.md | 21 | ||||
| -rw-r--r-- | railties/CHANGELOG.md | 8 |
3 files changed, 0 insertions, 36 deletions
diff --git a/activestorage/CHANGELOG.md b/activestorage/CHANGELOG.md index cc21c1f75a..2f8b65766d 100644 --- a/activestorage/CHANGELOG.md +++ b/activestorage/CHANGELOG.md @@ -4,12 +4,5 @@ *Jeremy Daer* -* Add source code to published npm package - - This allows activestorage users to depend on the javascript source code - rather than the compiled code, which can produce smaller javascript bundles. - - *Richard Macklin* - Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/activestorage/CHANGELOG.md) for previous changes. diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index db53c151ea..66b7365916 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,26 +1,5 @@ ## Rails 6.0.0.alpha (Unreleased) ## -* Caching: MemCache and Redis `read_multi` and `fetch_multi` speedup. - Read from the local in-memory cache before consulting the backend. - - *Gabriel Sobrinho* - -* Return all mappings for a timezone identifier in `country_zones` - - Some timezones like `Europe/London` have multiple mappings in - `ActiveSupport::TimeZone::MAPPING` so return all of them instead - of the first one found by using `Hash#value`. e.g: - - # Before - ActiveSupport::TimeZone.country_zones("GB") # => ["Edinburgh"] - - # After - ActiveSupport::TimeZone.country_zones("GB") # => ["Edinburgh", "London"] - - Fixes #31668. - - *Andrew White* - * `String#truncate_bytes` to truncate a string to a maximum bytesize without breaking multibyte characters or grapheme clusters like 👩👩👦👦. diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md index f1e16ec50f..51f6e1f0ac 100644 --- a/railties/CHANGELOG.md +++ b/railties/CHANGELOG.md @@ -4,13 +4,5 @@ *Jeremy Daer* -* Fix minitest rails plugin. - - The custom reporters are added only if needed. - - This will fix conflicts with others plugins. - - *Kevin Robatel* - Please check [5-2-stable](https://github.com/rails/rails/blob/5-2-stable/railties/CHANGELOG.md) for previous changes. |