explain how to extend application templates. [ci skip]
Revert "remove string based terminators for `ActiveSupport::Callbacks`."

This reverts commit d108672dada7ba97d3b3b56f0c6001cea621061e.

Conflicts:

	activesupport/CHANGELOG.md
Cleanup ul_encoded_params_parsing_test
Merge pull request #11131 from ykzts/fix/actiondispatch-ssl-not-required-space

Space is not required for Set-Cookie header
 #11288: Removed duplicated touching

if belongs to model with touch option on touch

Closes #11288
Revert "Merge pull request #11299 from arunagw/disable_implicit_join_references_removed"

`disable_implicit_join_references=` was only deprecated on `master`,
not with rails 4.0. We can remove it after 4.1

This reverts commit 3c719ead414ffd29e71efce185698af979052abb, reversing
changes made to d5c3bf9722abd5733a769c8d789de3f74dbfb92d.
Adding back deprecation require in all.rb
Merge pull request #11314 from raysrashmi/fix-missing-deprecation-stuff

Adding back deprecation require in all.rb
Merge branch 'master' of github.com:rails/docrails
Merged sections to reflect current contents of guide.

Section "allowing the update of fields" was now just a general
introduction to the idea of the model (actual updating was two sections
later).  So, merged into the section about validation.
Merge pull request #11322 from blahedo/master

Tidying "getting started" guide
Make HashWithIndifferentAccess#select always return the hash.

Hash#select! returns nil if the hash didn't change and thus behaves differently
from select, so it's return value can't be used as result for the latter.
Merge pull request #11327 from schuetzm/hash-with-indifferent-access-select

Make HashWithIndifferentAccess#select always return the hash.
Remove conditional, since results are always an instance of `ActiveRecord::Result`
Extract common query to a constant.

Perf ref: https://gist.github.com/vipulnsward/8209749201dfdd678c97
Merge pull request #11329 from vipulnsward/cache_one

Extract common query to a constant.
Remove action view test duplication

Same test exists above 2 or 3 lines.
Merge pull request #11332 from sanemat/fix/av-test-duplication

Remove actionview test duplication
fixes broken links in the API [Fixes #11335] [ci skip]
Merge pull request #11306 from jetthoughts/11288_remove_extra_queries_for_belongs_to_with_touch

 #11288: Removed duplicated touching

Conflicts:
	activerecord/CHANGELOG.md