Conflicts: activesupport/lib/active_support/json/encoding.rb activesupport/test/json/encoding_test.rb
This is a back-port of rails/rails#6525. See the commit notes there for details.
[ci skip] closes #5790
Thanks to @carlosantoniodasilva
…amoa. Further, Samoa and Tokelau jumped across the IDL from Dec 29 to Dec 31, 2011 switching from UTC-11 to UTC+13. American Samoa did not make the change and remains at UTC-11. Pacific/Fakaofo and Pacific/Apia are in TZInfo and documentation about the dateline change is in austalasia at IANA. (cherry picked from commit 1d08ce5)
I also removed the other require as it's already present in `activesupport/core_ext/time/calculations`
Logic in clone_empty method was dealing with old @dirty variable, which has changed by @html_safe in this commit: 139963c This was issuing a "not initialized variable" warning - related to: #5237 The logic applied by this method is already handled by the  override, so there is no need to reset the variable here.
* 3-2-2: bumping to 3.2.2 Ensure  respects the status of the buffer. Merge pull request #4834 from sskirby/fix_usage_of_psql_in_db_test_prepare Merge pull request #5084 from johndouthat/patch-1 updating RAILS_VERSION delete vulnerable AS::SafeBuffer# use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
* 3-2-stable-security: Ensure  respects the status of the buffer. delete vulnerable AS::SafeBuffer# use AS::SafeBuffer#clone_empty for flushing the output_buffer add AS::SafeBuffer#clone_empty fix output safety issue with select options
In asset_tag_helper_test.rb there is an assert on the number of bytes in a concatenated file. This test failed because Windows converts \n to \r\n as the default for "w". This is different than in *nix systems where there is no conversion done. THe test that failed was test_caching_stylesheet_link_tag_when_caching_on Using bin mode fixes this behavior on windows and makes no change on the *nix systems.