Conflicts:
	railties/guides/source/getting_started.textile

Fix for #5440

Add :conditions option to uniqueness validator

Should use an argument in http_digest_authentication_test.rb

fixed - warning: instance variable @controller not initialized

switch rack-test in Gemfile to using git protocol

use consistent explicit module inclusion

aid ease of understanding and readability for tests

can't run tests if git not compiled with libcurl

Fix ActiveRecord::Relation#blank? tests

not be added to every ActiveRecord::Base object.  Changed acts_as_yaffle
so it will include the LocalInstanceMethods module.  Now only
models that call acts_as_yaffle will get the squawk method, instead
of pushing them into every ActiveRecord::Base.

acts_as_yaffle expects a symbol, so the string was causing the tests
to always fail.

This reverts commit 55df1df9.

tests for Relation .present? .blank?

fixed - warning: ambiguous first argument; put parentheses or even spaces

ActiveRecord::Core#initialize: improve performance

Remove deprecation from AS::Deprecation behavior, some minor cleanups

* Refactor log subscriber, use select! to avoid a new object
* Remove deprecation messages related to AS::Deprecation behavior
  This was added about 2 years ago for Rails 3:
  https://github.com/rails/rails/commit/d4c7d3fd94e5a885a6366eaeb3b908bb58ffd4db
* Remove some not used requires
* Refactor delegate to avoid string conversions and if statements inside each block

fixed - warning: assigned but unused variable - checker

Fix exceptions messages in AC layouts

relation .present? and .blank? should not query SELECT COUNT(DISTINCT id)

Don't reset inheritance_column when setting explicitly.

allow zero-arity proc for AbstrController::layout

Fix typo in redirect test