Commit Graph

671 Commits

Author SHA1 Message Date
Rafael Mendonça França
53c845cb18 Preparing for 3.2.19 release 2014-07-02 12:55:09 -03:00
Rafael Mendonça França
4e8f1d2588 Preparing for 3.2.18 release 2014-05-06 11:33:10 -03:00
Rafael Mendonça França
666e9f65bd Preparing for 3.2.17 release 2014-02-18 15:16:57 -03:00
Aaron Patterson
64226302d8 updating the changelog 2013-12-02 16:17:19 -08:00
Aaron Patterson
2a0c4403fd bumping to 3.2.15 2013-10-15 11:48:53 -07:00
Aaron Patterson
e3abd78ee5 bumping to rc3 2013-10-11 14:16:06 -07:00
Aaron Patterson
5ede19b772 bumping to rc2 2013-10-04 13:46:35 -07:00
Aaron Patterson
5e277c8208 bumping version to 3.2.15.rc1 2013-10-03 11:52:44 -07:00
Rafael Mendonça França
2fcd13eff2 Preparing for 3.2.14 release 2013-07-22 12:05:41 -03:00
Rafael Mendonça França
a96df04aac Preparing for 3.2.14.rc2 release 2013-07-16 13:00:33 -03:00
Rafael Mendonça França
facfc24f25 Preparing for 3.2.14.rc1 release 2013-07-12 21:06:50 -03:00
Aaron Patterson
a4b5582772 bumping to 3.2.13 2013-03-18 09:23:04 -07:00
Aaron Patterson
ccf256d8dc bumping to rc2 2013-03-06 15:05:13 -08:00
Steve Klabnik
5ca59b02d1 Preparing for 3.2.13.rc1 release 2013-02-27 12:19:06 -08:00
Aaron Patterson
f1efecfc3f Merge branch '3-2-sec' into 3-2-stable
* 3-2-sec:
  bumping version
  remove ruby-prof
  Fix issue with attr_protected where malformed input could circumvent protection
  fixing call to columns hash. run the damn tests when you backport!
  Bump rack dependency to 1.4.5
  Merge pull request #9224 from dylanahsmith/bigdecimal-takes-string
  Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numeric

Conflicts:
	Gemfile
	activerecord/CHANGELOG.md
2013-02-11 10:19:31 -08:00
Aaron Patterson
1dccd44a5c bumping version 2013-02-10 19:05:41 -08:00
joernchen of Phenoelit
060bb7250b Fix issue with attr_protected where malformed input could circumvent
protection

Fixes: CVE-2013-0276
2013-02-09 17:00:25 -08:00
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
Aaron Patterson
746dbd89fa bumping version 2013-01-08 11:10:00 -08:00
Miguel
2e4df2a289 Merge tag 'v3.2.10' into 3-2-stable
Latest released tag was not fully merged into the stable branch (missed version bumping)
2013-01-03 11:54:21 +01:00
Aaron Patterson
8ba3df046f bumping version to 3.2.10 2012-12-23 13:36:49 -08:00
SHIBATA Hiroshi
127411fdf3 handled respond_to? with private methods 2012-12-03 22:07:14 +09:00
Rafael Mendonça França
e8c360527d Merge pull request #8352 from steveklabnik/update_7858
Specify type of singular assication during serialization
Conflicts:
	activemodel/CHANGELOG.md
	activemodel/test/cases/serializers/xml_serialization_test.rb
2012-11-29 13:41:38 -02:00
Santiago Pastorino
b33cf74a49 Bump to 3.2.9 2012-11-12 13:19:09 -02:00
Santiago Pastorino
db1d5f4071 Bump up to 3.2.9.rc3 2012-11-09 15:51:03 -02:00
Santiago Pastorino
de3dff3170 Bump to 3.2.9.rc2 2012-11-01 15:37:58 -02:00
Santiago Pastorino
fdfb3990cd Bump to 3.2.9.rc1 2012-10-29 14:38:23 -02:00
Jeremy Kemper
4b1a7bcc4c Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependency
Fix AM::Serializers::Xml dependency
2012-10-27 12:56:28 -02:00
Yves Senn
1f73a53071 active_model/validations requires necessary files to run 2012-10-18 14:51:16 +02:00
Santiago Pastorino
64146cf7ba Bump to 3.2.8 2012-08-09 16:26:36 -03:00
Santiago Pastorino
65b5e35e89 Bump to 3.2.8.rc2 2012-08-03 11:01:50 -03:00
Santiago Pastorino
fcccbacec1 Bump to 3.2.8.rc1 2012-08-01 17:50:48 -03:00
Aaron Patterson
21bcac1998 bumping to 3.2.7 2012-07-26 14:26:23 -07:00
Aaron Patterson
753c546df4 updating the version 2012-07-23 14:41:02 -07:00
Rafael Mendonça França
089371ac23 validates_inclusion_of and validates_exclusion_of now accept
`:within` option as alias of `:in` as documented.

Fix #7118
2012-07-20 14:19:26 -03:00
Aaron Patterson
10cdbbc56b Merge branch '3-2-stable-rel' into 3-2-stable
* 3-2-stable-rel:
  updating changelogs
  bumping version numbers
  updating changelogs with security fixes
  updating changelogs
  Array parameters should not contain nil values.
  Additional fix for CVE-2012-2661
2012-06-12 14:25:27 -07:00
Angelo capilleri
b97e0a1127 Fix the the backport of the object dup with the ruby 1.9.3p194.
At the end of initialize_dup was added the call to super if it exists,
so it also works with 1.8.7 where initialize_dup doesn't exist.
This issu was introduced with the pull request #6324
2012-06-12 18:04:44 +02:00
Aaron Patterson
ee4209a31e bumping version numbers 2012-06-11 15:40:36 -07:00
Tsutomu Kuroda
029936efbe Fix human attribute_name to handle deeply nested attributes
This is a back-port of b0e2fc84 to Rails 3.2.
See #5843 and #3859 also.
2012-06-06 12:50:09 +09:00
Aaron Patterson
b57fa0bf69 bumping to 3.2.5 2012-05-31 20:38:03 -07:00
Aaron Patterson
febd65223e bumping to 3.2.4 2012-05-31 10:27:47 -07:00
Aaron Patterson
fe4dfdd644 bumping to 3.2.4.rc1 2012-05-28 11:58:15 -07:00
Francesco Rodriguez
4bbd05c90e fix validations docs 2012-05-17 10:54:29 -05:00
Angelo Capilleri
e885b18fe9 add backport for the pull request #6324 2012-05-15 21:32:10 +02:00
Carlos Antonio da Silva
2dfa8b5995 Fix indent from previous merge 2012-05-15 13:41:49 -03:00
Angelo capilleri
396e383286 clean the errors if an object that includes validations errors is duped,for 3-2-stable
It Fixes #5953 in 3-2-stable, it's the same pull request of #6284
2012-05-15 18:20:53 +02:00
Santiago Pastorino
45d6cd94b3 Bump up to 3.2.3 2012-03-30 19:22:28 -03:00
Santiago Pastorino
5284e650be Bumping to 3.2.3.rc2 2012-03-29 13:12:44 -03:00
Santiago Pastorino
5f37260918 Bumping to 3.2.3.rc1 2012-03-27 14:07:36 -03:00
Carlos Antonio da Silva
e63f04cc0c Improve docs for attr_accessible|protected related to Hash#except|slice 2012-03-09 00:21:45 +05:30