load fixtures from linked folders
Merge pull request #11767 from kassio/master-load-fixtures-from-linked-folder

Load fixtures from linked folders[master]
Use the right instrumentation name

The pattern is event.component

Closes #11769

Conflicts:
	railties/CHANGELOG.md
Remove deprecated branch on the scope method.

The deprecation message was removed on 50cbc03d18c5984347965a94027879623fc44cce but the code was not.
config[:database] should be a string

This change was breaking the Railties tests. See
https://travis-ci.org/rails/rails/jobs/9865969
Merge pull request #11743 from gaurish/tmp-magic

[Jruby] Make all tests in ActionView::TemplateDigestorTest green
Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words

MRI reimplemented Date in C so it doesn't hit this division anymore
while JRuby still uses the old stdlib implementation of Date so
it will always hit this.

With this change the actionview date_helper_test.rb tests should pass on JRuby.
Merge pull request #11771 from atambo/jruby_assert_distance_of_time_in_words

Remove privatizing of Fixnum#/ from assert_distance_of_time_in_words
added String#to_date documentation to Rails 4 upgrade guide

[ci skip]
#11759: Update Assets Pipeline Guide

by default included to precompile only non-js/css files from `app/assets` and `application.(css|js)`
adding a weird test case
Merge pull request #11778 from jetthoughts/11759_update_assets_guides

Update Assets Pipeline Guide [ci skip]
Add CHANGELOG entry for #11767

[ci skip]
asakusa.rb hack night!

Fix in-memory tests
Fix indentation
Use the proper encoding comment on the file
Add a missing require.

This makes the rack_logger_test.rb runnable by itself (outside of the `rake test` suite).
"Naked" rescue clauses only catch StandardError subclasses.

Similar to #11497.
Merge pull request #11780 from thedarkone/logger-naked-rescue-fix

Rack::Logger naked rescue fix
Only cache template digests if config.cache_template_loading

since ActionView::Resolver.caching is set to the same value as config.cache_template_loading
only cache template digests if config.cache_template_loading is not falsy
fixes issues #10752 and #10791