This reverts commit 0e407a90, reversing
changes made to 533a9f84.

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
	activerecord/test/cases/migration_test.rb

This reverts commit 81fad6a2, reversing
changes made to 23101de2.

Conflicts:

	activerecord/test/cases/migration_test.rb

Move schema_format :sql config setting from test.rb to application.rb

I've moved the schema_format :sql config setting to application.rb because you would
never enable this only for the test environment. If you use database constraints
or database specific data types you would want all of your environments to use them.

Fix impractical I18n lookup in nested fields_for

It should be @calculated_ip not @calculate_ip

We are using @calculated_ip. 
@calculate_ip is no where used

No need to `readlines` then `join`, just use `read` ❤

same as 4c1a1933

Fixes for Request#remote_ip (no middleware, all proxies)

CSS fix to prevent error output from being breaking out of body element.

Becomes includes errors

This commit contains a simple failing test that demonstrates the behaviour we expect, and a fix. When using `becomes` to transform the type of an object, it should retain any error information that was present on the original instance.

Unused variable removed

This reverts commit 8d1a2b3e, because I have fixed the issues this commit caused in the next commit.

schema_format :sql should behave like schema_format :ruby

Switch from marshal format to plain text for the encoding conversions dump. This is for windows compatibility. Fixes #3644.

This is to avoid a conflict that occurs when you add Rake to
your Gemfile. There is a Commands Object in Rake that conflicts
with the Commands module in plugin.rb. See rails issue #1866.

Fixes 3483

This reverts commit 6491aadc, reversing
changes made to 83bf0b62.

See https://github.com/rails/rails/pull/3640#issuecomment-2752761 for
explanation.

GetIp#to_s should never return nil. That's icky.

Fixes issue #3483, regarding using a mixture of ranges and discrete values in find conditions. Paired with Joey Schoblaska.