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

3 files changed, 3 insertions, 3 deletions

diff --git a/activerecord/test/cases/adapters/postgresql/json_test.rb b/activerecord/test/cases/adapters/postgresql/json_test.rb
index 01e7334aad..3daef399d8 100644
--- a/activerecord/test/cases/adapters/postgresql/json_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/json_test.rb
@@ -21,7 +21,7 @@ class PostgresqlJSONTest < ActiveRecord::TestCase
         end
       end
     rescue ActiveRecord::StatementInvalid
-      return skip "do not test on PG without json"
+      skip "do not test on PG without json"
     end
     @column = JsonDataType.columns.find { |c| c.name == 'payload' }
   end
diff --git a/activerecord/test/cases/adapters/postgresql/range_test.rb b/activerecord/test/cases/adapters/postgresql/range_test.rb
index a56b8ac791..5c2d8e1c1d 100644
--- a/activerecord/test/cases/adapters/postgresql/range_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/range_test.rb
@@ -26,7 +26,7 @@ if ActiveRecord::Base.connection.supports_ranges?
           end
         end
       rescue ActiveRecord::StatementInvalid
-        return skip "do not test on PG without range"
+        skip "do not test on PG without range"
       end
 
       insert_range(id: 101,
diff --git a/activerecord/test/cases/adapters/postgresql/xml_test.rb b/activerecord/test/cases/adapters/postgresql/xml_test.rb
index bf14b378d8..dd2a727afe 100644
--- a/activerecord/test/cases/adapters/postgresql/xml_test.rb
+++ b/activerecord/test/cases/adapters/postgresql/xml_test.rb
@@ -18,7 +18,7 @@ class PostgresqlXMLTest < ActiveRecord::TestCase
         end
       end
     rescue ActiveRecord::StatementInvalid
-      return skip "do not test on PG without xml"
+      skip "do not test on PG without xml"
     end
     @column = XmlDataType.columns.find { |c| c.name == 'payload' }
   end