aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--actionmailer/CHANGELOG.md16
-rw-r--r--actionpack/CHANGELOG.md2
-rw-r--r--activerecord/CHANGELOG.md3
-rw-r--r--railties/CHANGELOG.md3
4 files changed, 13 insertions, 11 deletions
diff --git a/actionmailer/CHANGELOG.md b/actionmailer/CHANGELOG.md
index d84b95e6e9..dc8c6bdf74 100644
--- a/actionmailer/CHANGELOG.md
+++ b/actionmailer/CHANGELOG.md
@@ -1,12 +1,14 @@
-* Instrument the generation of Action Mailer messages. The time it takes to
- generate a message is written to the log.
+* Instrument the generation of Action Mailer messages. The time it takes to
+ generate a message is written to the log.
- *Daniel Schierbeck*
+ *Daniel Schierbeck*
-* invoke mailer defaults as procs only if they are procs, do not convert
- with to_proc. That an object is convertible to a proc does not mean it's
- meant to be always used as a proc. Fixes #11533
+* Invoke mailer defaults as procs only if they are procs, do not convert with
+ `to_proc`. That an object is convertible to a proc does not mean it's meant
+ to be always used as a proc.
- *Alex Tsukernik*
+ Fixes #11533.
+
+ *Alex Tsukernik*
Please check [4-0-stable](https://github.com/rails/rails/blob/4-0-stable/actionmailer/CHANGELOG.md) for previous changes.
diff --git a/actionpack/CHANGELOG.md b/actionpack/CHANGELOG.md
index be361b8f23..638c05619d 100644
--- a/actionpack/CHANGELOG.md
+++ b/actionpack/CHANGELOG.md
@@ -2,7 +2,7 @@
*Sıtkı Bağdat*
-* Take a hash with options inside array in #url_for.
+* Take a hash with options inside array in `#url_for`.
Example:
diff --git a/activerecord/CHANGELOG.md b/activerecord/CHANGELOG.md
index 97e5d236a8..4a9022e66b 100644
--- a/activerecord/CHANGELOG.md
+++ b/activerecord/CHANGELOG.md
@@ -1,5 +1,4 @@
-* Make ActiveRecord::Relation#unscope affect relations it is merged in
- to.
+* Make `ActiveRecord::Relation#unscope` affect relations it is merged in to.
*Jon Leighton*
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 0b252bf745..21ac596ab9 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,6 +1,7 @@
* Remove turbolinks when generating a new application based on a template that skips it.
- Example
+ Example:
+
Skips turbolinks adding `add_gem_entry_filter { |gem| gem.name != "turbolinks" }`
to the template.