Remove unneeded require
Fix code example in Getting Started guide - fixes #11219 [ci skip]
Merge pull request #11232 from frodsan/fix_11219

Fix code example in Getting Started guide - fixes #11219 [ci skip]
Support array as root element in JSON
Add CHANGELOG entry for 1c9f9a2 [ci skip]
Merge pull request #11244 from ccarruitero/testing-guide

update test names in testing guide [ci-skip]
Merge pull request #11235 from frodsan/support_array_as_root_element_in_json

Support array as root element in JSON
fix to_sql output on eager loaded relations
Revert "fix to_sql output on eager loaded relations"

This reverts commit a9748da24a5643f012fa747c2b6aa957ac7c4ee2.
Merge pull request #11286 from edogawaconan/fix/doc-201307041646

Missing closing + in documentation [ci skip]
Merge pull request #11285 from ankit8898/master

Fixing the broken wikipedia link for Optimistic Concurrency control [ci skip]
replace artificial space with RDoc markup (follow up #11285). [ci skip]
Merge pull request #11261 from ryan-endacott/fixguide

Removed redundant upgrade docs on new cookies. [ci skip]
Merge pull request #11303 from evsyukovmv/specify-request-method-in-guides

Specify request method in guides [ci skip]
Merge pull request #11309 from crakalakin/AR-querying-guide

removes markdown code markers from displaying in the active record querying guide [ci skip]
fixes broken links in the API [Fixes #11335] [ci skip]
fixes Rails version for the stable API [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

Conflicts:
	activerecord/CHANGELOG.md
	activerecord/lib/active_record/associations/builder/belongs_to.rb
Merge pull request #11347 from ankit8898/refactoring-sp

Refactored strong parameters usage and updated Gemfile.lock with Rails 4
Fix "Stack Level Too Deep" error when rendering recursive partials

When rendering recursive partial Action View is trying to generate the
view digest infinitly causing a stack level error.

Fixes #11340