Merge branch 'master' into adequaterecord

* master:
  Make AR::Base#touch fire the after_commit and after_rollback callbacks
  Fix test for cache_key + touched
  Revert "methods are defined right after the module_eval, so we don't need to do"
  Revert "Don't remove trailing slash from PATH_INFO for mounted apps"
  Add failing test for #13369
  reset column information after fiddling with `Encoding.default_internal`
  we have `with_env_tz` as global test helper. Remove duplicate.
  isolate class attribute assignment in `migration_test.rb`
  use `teardown` for cleanup, not `setup`.
  tests without transactional fixtures need to cleanup afterwards.
  no need to `return skip` in tests. `skip` is enough.
  methods are defined right after the module_eval, so we don't need to do any line number maths
  Get rid of unused TransactionError constant
  Avoid converting :on option to array twice when defining commit/rollback callbacks
  Unify changelog entries about single quotes [ci skip]
  Use single quotes in generated files

1 files changed, 2 insertions, 2 deletions

diff --git a/railties/CHANGELOG.md b/railties/CHANGELOG.md
index e314ab5637..da7a4ce59a 100644
--- a/railties/CHANGELOG.md
+++ b/railties/CHANGELOG.md
@@ -1,6 +1,6 @@
-*   Write controller generated routes in routes.rb with single quotes.
+*   Use single quotes in generated files.
 
-    *Cristian Mircea Messel*
+    *Cristian Mircea Messel*, *Chulki Lee*
 
 *   Only lookup `config.log_level` for stdlib `::Logger` instances.
     Assign it as is for third party loggers like `Log4r::Logger`.