aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew White <pixeltrix@users.noreply.github.com>2018-03-12 10:43:22 +0000
committerGitHub <noreply@github.com>2018-03-12 10:43:22 +0000
commitaacda9c6901bef01ffac6a11b073305676b3062f (patch)
tree34c181e5e1f081f42c10f37df44d9516a96996b7
parentee01c753a3f6fc459e4215117a92085f47f46833 (diff)
parentdd075657d0743046206348e05a5ee4d6d8b3f9fa (diff)
downloadrails-aacda9c6901bef01ffac6a11b073305676b3062f.tar.gz
rails-aacda9c6901bef01ffac6a11b073305676b3062f.tar.bz2
rails-aacda9c6901bef01ffac6a11b073305676b3062f.zip
Merge pull request #32224 from bogdanvlviv/fix-rails_6_0-changelogs
Fix CHANGELOGs [ci skip]
-rw-r--r--actionview/CHANGELOG.md10
-rw-r--r--activejob/CHANGELOG.md2
-rw-r--r--activesupport/CHANGELOG.md4
3 files changed, 7 insertions, 9 deletions
diff --git a/actionview/CHANGELOG.md b/actionview/CHANGELOG.md
index 55f2148640..76159b9d28 100644
--- a/actionview/CHANGELOG.md
+++ b/actionview/CHANGELOG.md
@@ -3,10 +3,10 @@
* 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" },
+ select :post,
+ :category,
+ ["lifestyle", "programming", "spiritual"],
+ { selected: "", disabled: "", prompt: "Choose one" },
{ required: true }
Placeholder option would be selected and disabled. The HTML produced:
@@ -19,7 +19,7 @@
*Sergey Prikhodko*
-* Don't enforce UTF-8 by default
+* Don't enforce UTF-8 by default.
With the disabling of TLS 1.0 by most major websites, continuing to run
IE8 or lower becomes increasingly difficult so default to not enforcing
diff --git a/activejob/CHANGELOG.md b/activejob/CHANGELOG.md
index c6a3ad8ade..2fda34afc9 100644
--- a/activejob/CHANGELOG.md
+++ b/activejob/CHANGELOG.md
@@ -1,6 +1,6 @@
## Rails 6.0.0.alpha (Unreleased) ##
-* Add support for timezones to Active Job
+* Add support for timezones to Active Job.
Record what was the current timezone in effect when the job was
enqueued and then restore when the job is executed in same way
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md
index 9351a75dfa..ac1e58fbaa 100644
--- a/activesupport/CHANGELOG.md
+++ b/activesupport/CHANGELOG.md
@@ -6,8 +6,6 @@
URI.unescape("%E3%83%90") # => "バ"
URI.unescape("\xe3\x83\x90%E3%83%90") # => Encoding::CompatibilityError
- GH#32183
-
*Ashe Connor*, *Aaron Patterson*
* Add `:private` option to ActiveSupport's `Module#delegate`
@@ -53,7 +51,7 @@
*Jeremy Daer*
-* Adds parallel testing to Rails
+* Adds parallel testing to Rails.
Parallelize your test suite with forked processes or threads.