Allow habtm class_name option to be consistent with other associations
Update to Unicode 7.0.0

7.0.0 was released on June 16, 2014

http://unicode-inc.blogspot.com.ar/2014/10/unicode-version-70-complete-text-of.html

ruby bin/generate_tables
Skip spring install in Cygwin due to fork() bad support.

See also: https://www.cygwin.com/faq.html#faq.using.fixing-fork-failures
Fix for assigns(:..) resetting template assertions

When calling assigns(:...) or cookies(:...), template assertions would be reset, which they obviously shouldn't be.
PERF: optimise type lookup to avoid invoking procs
Minor English fixes in docs [ci skip]
Revert "Merge pull request #16622 from matthewd/default-debug"

This reverts commit 2602a49a8600ab52f807599bbd5b1f9c0be4214f, reversing
changes made to 5d7c1057684c377bc2801c8851e99ff11ab23530.

The explicit default was introduced in 21f6d72, so apps created with Rails < 4
have the commented out version, which means that this change would break those
apps.
Deprecate different default for `log_level` in production

This is a more conservative approach to 2602a49. Also changed the comment to be
more inline with everything else in the file (describing what the config value
is doing and why). People should just read the docs for alternatives.
Meant to describe the concept, not the setting [ci skip]
Merge pull request #17645 from georgemillo/master

Minor English fixes in docs [ci skip]
Merge pull request #17628 from bf4/update_unicode

Update to Unicode 7.0.0
Merge pull request #17642 from tgxworld/fix_template_assertion_on_assigns

Fix for assigns(:..) resetting template assertions
Merge pull request #17640 from michaeljayt/spring-not-working-in-cygwin

Skip spring install in Cygwin due to fork() bad support.
Merge pull request #17643 from SamSaffron/select_all_perf

PERF: optimise type lookup to avoid invoking procs
Remove pointless `private`

This class no longer has any private methods
Add StackProf to the test group for 2.1

Makes life easier for people profiling on master.
Improve the performance of quoting table names on PG

This caused a pretty major performance regression for 4.2, as this is a
hotspot for query construction. We're still slightly slower than 4.1,
but it's much less significant.
Fix typo.
Merge pull request #17647 from tgxworld/fix_typo

Fix typo. [ci skip]
document_root_element need to be public