Merge pull request #14853 from kassio/kb-fix-custom-join-table-habtm

Fix to use custom join table in habtm
Warning removed for missmatched indentation
Fix documentation of extract_handler_and_format_and_variant [ci skip]
Merge pull request #14875 from prathamesh-sonpatki/fix-extract-handler-format-variant-doc

Fix documentation of extract_handler_and_format_and_variant [ci skip]
Merge pull request #14874 from arunagw/aa-warning-removed-missmatched

Warning removed for missmatched indentation
Merge pull request #14872 from jonatack/patch-7

Grammar and formatting fixes in Form Helpers Guide
Generators, remove leftover variable assignment. refs #14877

The last uses of this variable was removed with the `--builder` option.
  2da5ea1c9feb4a7b491bd00bd6ffd931b9203da8
Revert "Document ActionController::TestCase::Behavior::ClassMethods.process"

This reverts commit 2aef9fddf8b4487a05638ea3341dfd65ceb229ef.

Reason: The added change isn't clear in terms of explaining the
arguments. Will ask the author to provide a PR and take it forward.

[ci skip]
Revert "Running AR tests on postgres, mysql & sqlite"

This reverts commit 28bd442034e0974d0a4d664076dafb8e9555816d.

Reason: Existing text was clearer imo.

[ci skip]
Merge branch 'master' of github.com:rails/docrails
Swallow bundler exceptions when running tests

Let's avoid useless output when testing stuff related to Bundler.
Revert "Don't rely on Arel master in bug report template [ci skip]"

This reverts commit fd6d7835.

We are back on arel master, see b395265f.
Remove double declaration of memcache services on travis
Merge pull request #14889 from kiela/master

Remove double declaration of memcache services on travis
Added a missing `end`
Merge pull request #14890 from fuzzyalej/patch-1

Added a missing `end`
write a new method to be accessed from delete_all

The delete method is very coupled with delete all even
though only a portion of the conditionals apply. Decoupling
this will make the code easier to understand and manipulate.
remove unnecessary code from delete method

Now that we have a new method delete_all_with_dependency this
coupled conditional is no longer needed.
simplify the delete all w/ dependency method

After reviewing this code I realized the conditional that was
there previously was basically saying if the dependency is not
delete all. This is a better, cleaner, and clearer way to write
this method.
Merge pull request #14892 from eileencodes/breakup-complex-conditionals-on-delete

Breakup complex conditionals on delete