remove the skip_jbuilder option, just rm it from the Gemfile
Remove dead code after the skip_jbuilder option removal
Merge pull request #12664 from jetthoughts/12242_includes_in_through_association

Skip `include_values` from through associations chains for building association scope
Assert the return value in the test
Remove warning of shadowing outer local variable
Fixed tests for app_generator

Added test for jbuilder and web-console inclusion.

Added README.rdoc for test default files
Merge pull request #12668 from arunagw/aa-improvments

Test fixed for app_generator
Merge pull request #12578 from jeradphelps/configurable_schema_migrations_table_name

Configurable name for schema_migrations table

Conflicts:
	activerecord/CHANGELOG.md
Fix indentation [ci skip]
Fix typo
fix typo in comment [ci skip].
Merge pull request #11564 from zzak/active_model_guide

[Guides] Active Model Basics [ci skip]
guides/rails_on_rack: Fix formatting of _Internal Middleware Stack_ section
use a queue rather than a list. fixes #12069
Merge pull request #11785 from grosser/grosser/file-unless-exist

support :unless_exist for FileCache

Conflicts:
	activesupport/CHANGELOG.md
	activesupport/test/caching_test.rb
always call set_default_accessors from create_root
fix template Gemfiles
Remove confusing generated-code commentary
Add failing test for preloading with a polymorphic association and using the existential predicate
Fix broken delete_all test, which will now be failing since #delete_all is broken