add include_hidden option to collection_check_boxes helper
Add Public Api for register new extensions for Rake Notes
Remove .scss, .sass, .less, .haml, .slim, coffee from Rake Notes. Now we have an API for register it in the corresponding gems
Supporting .ruby, .yml and .yaml Extension in Rake Notes
Still touch associations when theres no timestamp

Prior to Rails 4.0.4 when touching a object which doesn't have timestamp
attributes (updated_at / updated_on) rails would still touch all
associations. After 73ba2c14cd7d7dfb2d132b18c47ade995401736f it updates
associations but rollsback because `touch` would return nil since
there's no timestamp attribute
Use teardown helper method.

Follow-Up to https://github.com/rails/rails/pull/14348

Ensure that SQLCounter.clear_log is called after each test.

This is a step to prevent side effects when running tests. This will allow us to run them in random order.
re-raise error if error occurs before committing in streaming

update the tests, using an if-else
Merge pull request #14380 from tgxworld/use_teardown_helper_method_in_activerecord

Use teardown helper method.
Remove deprecation on active_support/core_ext/class/attribute_accessors requires. Appropriate to keep this, users don't care that the implementation got unified.
Clarify AV::Digestor.digest method signature docs and deprecation warning
Minor grammer, code conventions fix [ci skip]

Conflicts:
	activesupport/lib/active_support/core_ext/hash/conversions.rb
Merge pull request #14394 from zoltankiss/fix_typo

Minor grammer, code conventions fix [ci skip]
Fix MailerPreview broken tests

`BaseMailerPreview.welcome` is an instance method, so we need to stub the
method on a instance level and not on Class. The stub is important to make
sure the Message object is the same in the other expectations.
This was working randomly because Mocha uses == to compare two objects
on the `with()` expectation and even if the Mail::Message objects were
not the same object they are equal, but thats not the case in 100% of
the runs. So we need to make sure we use `.any_instance` method and have
the right message object.
Merge pull request #12662 from nashby/include-hidden-collection

add include_hidden option to collection_check_boxes helper

Conflicts:
	actionview/CHANGELOG.md
	actionview/test/template/form_collections_helper_test.rb
Merge pull request #14395 from arthurnn/fix_mailer_preview_test

Fix MailerPreview broken tests
Reword 5.6 strong parameters and private method stuff [ci skip]
Merge pull request #14396 from afshinator/master

Reword 5.6 strong parameters and private method stuff [ci skip]
Extend fixture label replacement to allow string interpolation

Allows fixtures to use their $LABEL as part of a string instead
of limiting use to the entire value.

    mark:
      first_name: $LABEL
      username: $LABEL1973
      email: $LABEL@$LABELmail.com

    users(:mark).first_name # => mark
    users(:mark).username   # => mark1973
    users(:mark).email      # => mark@markmail.com
Merge pull request #14399 from genericsteele/fixture-label-string-interpolation

Extend fixture label replacement to allow string interpolation
Let COMMAND_WHITELIST be an Array, not a String