Commit Graph

608 Commits

Author SHA1 Message Date
Dirkjan Bussink
c831f67d8b Remove Proc#bind from Rails 3.2 2014-10-08 14:08:40 +02:00
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
eb8807e84d Merge branch '3-2-15' into 3-2-sec
* 3-2-15:
  bumping to rc3
  Revert "Merge pull request #12413 from arthurnn/inverse_of_on_build"
  Revert "Merge pull request #12443 from arthurnn/add_inverse_of_add_target"
  bumping to rc2
  Merge pull request #12443 from arthurnn/add_inverse_of_add_target
  bumping version to 3.2.15.rc1
  Fix STI scopes using benolee's suggestion. Fixes #11939
2013-10-15 11:15:08 -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
Michael Koziarski
5aee516b5e Remove the use of String#% when formatting durations in log messages
This avoids potential format string vulnerabilities where user-provided
data is interpolated into the log message before String#% is called.
2013-09-30 14:42:11 -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
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
Yves Senn
9b72c36783 Backport #8450, the return value from mailer methods is not relevant.
Conflicts:

	actionmailer/CHANGELOG.md
	actionmailer/lib/action_mailer/base.rb
2012-12-10 17:00:41 +01:00
Yves Senn
d1b9c5fd11 revised the actionmailer's CHANGELOG structure 2012-12-10 17:00:16 +01: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
Rafael Mendonça França
37586ddf27 Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call
Do not render views when mail() isn't called. (NullMail refactoring)
Conflicts:
	actionmailer/CHANGELOG.md
2012-10-28 17:58:48 -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
Aaron Patterson
ee4209a31e bumping version numbers 2012-06-11 15:40:36 -07: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
Carlos Antonio da Silva
2506d4ad9e Merge pull request #6018 from lest/patch-1
mailer can be anonymous
2012-05-14 10:21:27 -03: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
Aaron Patterson
01b470f526 bumping to 3.2.2 2012-03-01 09:16:28 -08:00
Aaron Patterson
4bcd437f76 updating RAILS_VERSION 2012-02-22 12:03:13 -08:00
Santiago Pastorino
19433ce870 format lookup for partials is derived from the format in which the template is being rendered
Closes #5025 part 2
2012-02-22 11:13:02 -02:00
Xavier Noria
67b8fbca92 updating RAILS_VERSION 2012-01-26 14:54:02 -08:00
David Heinemeier Hansson
f36dcaf488 Preparing for 3.2.0 release 2012-01-20 17:44:32 +01:00
Santiago Pastorino
d268ef2f65 Bump to rc2 2012-01-04 18:59:41 -02:00
David Heinemeier Hansson
9d6e52b55e Party like its R-C-UNO! 2011-12-19 18:34:57 -06:00