Aaron Patterson 48810a52df Merge branch '3-2-sec' into 3-2-secmerge ...

* 3-2-sec:
  bumping version
  CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.
  * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
  Avoid Rack security warning no secret provided

Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md

2013-01-08 11:37:48 -08:00

..

active_record/connection_adapters

pushing caching and visitors down to the connection

2011-11-19 20:19:53 -08:00

assets

Merge pull request #4809 from cfeist/feist-sqlite-binary-corruption

2012-02-02 09:16:06 -08:00

cases

Merge branch '3-2-sec' into 3-2-secmerge

2013-01-08 11:37:48 -08:00

fixtures

Fix deleting from a HABTM join table upon destroying an object of a model with optimistic locking enabled. Fixes #5332.

2012-11-13 10:36:24 -08:00

migrations

recognize migrations, in folders containing numbers and 'rb'.

2012-12-13 11:40:02 +01:00

models

Serialized attribute can be serialized in an integer column

2012-12-21 16:04:56 -03:00

schema

Serialized attribute can be serialized in an integer column

2012-12-21 16:04:56 -03:00

support

Add require 'pathname' as it has not already been required in some circumstances

2011-06-17 14:55:34 +01:00

.gitignore

Refactor Active Record test connection setup. Please see the RUNNING_UNIT_TESTS file for details, but essentially you can now configure things in test/config.yml. You can also run tests directly via the command line, e.g. ruby path/to/test.rb (no rake needed, uses default db connection from test/config.yml). This will help us fix the CI by enabling us to isolate the different Rails versions to different databases.

2011-06-04 23:47:03 +01:00

config.example.yml

Backport PostgreSQL auto-reconnect test coverage

2012-09-13 14:57:59 -07:00

config.rb

Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails

2008-01-21 17:20:51 +00:00