aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--guides/source/4_2_release_notes.md4
-rw-r--r--railties/CHANGELOG.md2
2 files changed, 5 insertions, 1 deletions
diff --git a/guides/source/4_2_release_notes.md b/guides/source/4_2_release_notes.md
index 94a3c728fe..3a9be62865 100644
--- a/guides/source/4_2_release_notes.md
+++ b/guides/source/4_2_release_notes.md
@@ -358,6 +358,10 @@ Please refer to the [Changelog][railties] for detailed changes.
([Pull Request](https://github.com/rails/rails/pull/16129))
+* Introduce a `--skip-turbolinks` option in the app generator to not generate
+ any turbolinks integration.
+ ([Commit](https://github.com/rails/rails/commit/bf17c8a531bc8059d50ad731398002a3e7162a7d))
+
* Introduced a `bin/setup` script to enable automated setup code when
bootstrapping an application.
([Pull Request](https://github.com/rails/rails/pull/15189))
diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index 2960eccb3f..0d91b19ed2 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -89,7 +89,7 @@
*Rafael Mendonça França*
-* Add a generic --skip-turbolinks options to generator.
+* Add `--skip-turbolinks` option to the app generator.
*Rafael Mendonça França*