First deprecated, now removed: https://github.com/rails/rails/commit/9add7608f1acaa68b025470e7a38901d7e6161ca#activerecord/lib/active_record/attribute_methods/primary_key.rb

Stop interpreting SQL 'string' columns as :string type.

Change the wording to explain following methods skip callbacks [ci skip]

ensure freeze on Thread freezes locals (#11831)

Refactor of the work done in #11891

Normalize file parameters in same place as other parameters (ActionDispatch::Http::Parameters#normalize_encode_params)

SSE class for ActionController::Live

This fixes a regression. The documentation said in its introduction
paragraph that the method returns truthy/falsy, but then below it
was said that if there were no arguments you'd get `true` or `false`.
Also when the argument is exactly `false` a singleton is documented
to be returned.

The method was not returning the singletons so it didn't conform to
those special cases.

The best solution here seems to be to just return singletons in all
cases. This solution is backwards compatible. Also, the contract
has been revised because it has no sense that the predicate varies
that way depending on the input. I bet the previous contract was just
an accident, not something mixed on purpose.

Conflicts:
	activerecord/lib/active_record/relation/finder_methods.rb
	activerecord/test/cases/finder_test.rb

Follow-up to #11934

clarify instructions in contributing_to_ruby_on_rails.md for committing ...
[ci skip]

Memcached note for Rails guides [ci skip]

Dont' check for any order in hash since we aren't sorting it and this is determinated only by the used interpreter

blorgh_engine to blorgh

Fail informatively in #respond_with when no appropriate #api_behavior renderer is available.

Add tests for ActiveModel::Serializers::JSON#as_json ordering variations

Currently if a user calls #respond_with(csvable), but has not csv
renderer available, Responder will just run through the default render
behavior twice, raising ActionView::MissingTemplate both times.

This changes ActionController::Metal::Responder#api_behavior to check
in advance whether there is a renderer available, and raise
ActionController::MissingRenderer if not.

Conflicts:
	actionview/README.rdoc
	activerecord/lib/active_record/migration.rb
	guides/source/development_dependencies_install.md
	guides/source/getting_started.md

This reverts commit 70d6e16f, reversing
changes made to ea4db3bc.

Seems to be a code merge done by mistake.

Fixed grammar error in ordered_options documention.

SQL doesn't have a string type, and interpreting 'string' as text is
contrary to at least SQLite3's behavior:

"Note that a declared type of 'STRING' has an affinity of NUMERIC, not TEXT."
http://www.sqlite.org/datatype3.html

Improve the testing guide [ci skip]

Add note about installing and running Memcached for Rails test suite tests that depend on it. [ci skip]

Use binary mode to write uploaded files [ci skip]

Use binary mode to write uploaded files [ci skip] See: http://stackoverflow.com/a/4988984/129798 for an explanation for why this is required for Ruby 1.9.