Bugfix circular reference while saving has_one relationship
Test for circular reference while saving has_one relationship
Merge pull request #5044 from dracco/3-0-stable

Backport Bugfix: Stack Overflow (3-0-stable)
Lock mocha gem to fix the build

New versions of mocha don't allow nil.stubs
auto_link final sanitize
Merge pull request #6485 from homakov/3-0-stable

auto_link sanitize output
do not force sanitize and whitelist protocols for auto_link

sanitize is not always required so we cannot make it. let's just
whitelist protocols
Merge pull request #6495 from homakov/3-0-stable

auto_link shouldn't always sanitize
Remove test for not accepted protocols to auto_link
bumping to 3.0.13.rc1
predicate builder should not recurse for determining where columns.
Thanks to Ben Murphy for reporting this

CVE-2012-2661
Strip [nil] from parameters hash.
Thanks to Ben Murphy for reporting this!

CVE-2012-2660

Conflicts:

	actionpack/lib/action_dispatch/http/request.rb
Merge branch '3-0-stable-sec' into 3-0-rel

* 3-0-stable-sec:
  Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
  predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
updating CHANGELOGs
bumping to 3.0.13
Merge branch '3-0-stable-sec' into 3-0-stable

* 3-0-stable-sec:
  Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this!
  predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
Merge branch '3-0-rel' into 3-0-stable

* 3-0-rel:
  bumping to 3.0.13
  updating CHANGELOGs
  bumping to 3.0.13.rc1
Additional fix for CVE-2012-2661

While the patched PredicateBuilder in 3.0.13 prevents a user
from specifying a table name using the `table.column` format,
it doesn't protect against the nesting of hashes changing the
table context in the next call to build_from_hash. This fix
covers this case as well.
Array parameters should not contain nil values.
Fix GH #3163. Should quote database on mysql/mysql2.

Conflicts:

	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

Conflicts:

	activerecord/lib/active_record/connection_adapters/abstract_mysql_adapter.rb
	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb

Conflicts:

	activerecord/lib/active_record/connection_adapters/mysql2_adapter.rb
	activerecord/lib/active_record/connection_adapters/mysql_adapter.rb
	activerecord/test/cases/adapters/mysql/mysql_adapter_test.rb
	activerecord/test/cases/adapters/mysql2/schema_test.rb