Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | updating the changelog | Aaron Patterson | 2013-12-02 | 1 | -1/+1 |
| | |||||
* | updating changelogs | Aaron Patterson | 2013-10-16 | 1 | -0/+4 |
| | |||||
* | bumping to 3.2.15 | Aaron Patterson | 2013-10-15 | 1 | -1/+1 |
| | |||||
* | Merge branch '3-2-15' into 3-2-sec | Aaron Patterson | 2013-10-15 | 1 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | bumping to rc3 | Aaron Patterson | 2013-10-11 | 1 | -1/+1 |
| | | |||||
| * | bumping to rc2 | Aaron Patterson | 2013-10-04 | 1 | -1/+1 |
| | | |||||
| * | bumping version to 3.2.15.rc1 | Aaron Patterson | 2013-10-03 | 1 | -2/+2 |
| | | |||||
* | | Remove the use of String#% when formatting durations in log messages | Michael Koziarski | 2013-09-30 | 1 | -3/+3 |
|/ | | | | | This avoids potential format string vulnerabilities where user-provided data is interpolated into the log message before String#% is called. | ||||
* | Preparing for 3.2.14 release | Rafael Mendonça França | 2013-07-22 | 1 | -1/+1 |
| | |||||
* | Update CHANGELOG entry | Rafael Mendonça França | 2013-07-22 | 1 | -6/+1 |
| | |||||
* | Preparing for 3.2.14.rc2 release | Rafael Mendonça França | 2013-07-16 | 2 | -2/+7 |
| | |||||
* | Preparing for 3.2.14.rc1 release | Rafael Mendonça França | 2013-07-12 | 2 | -3/+3 |
| | |||||
* | Add license to the gemspec | Rafael Mendonça França | 2013-07-08 | 1 | -0/+3 |
| | |||||
* | Merge pull request #10646 from kennyj/fix_am_20130517 | Rafael Mendonça França | 2013-05-20 | 1 | -1/+1 |
| | | | | | | | Fix ActionMailer testcase break with mail 2.5.4. Conflicts: actionmailer/CHANGELOG.md actionmailer/test/mailers/base_mailer.rb | ||||
* | Update mail to minimum version 2.5.4 | Mikel Lindsaar | 2013-05-14 | 1 | -1/+1 |
| | |||||
* | Add release dates to documentation [ci skip] | claudiob | 2013-03-18 | 1 | -1/+1 |
| | | | | Set "March 18, 2013" as the release date for 3.2.13 | ||||
* | Merge branch '3-2-13' into 3-2-stable | Aaron Patterson | 2013-03-18 | 2 | -2/+2 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-13: bumping to 3.2.13 fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854] Merge pull request #9616 from exviva/multiple_select_name_double_square_brackets bumping to rc2 Revert "Merge pull request #8209 from senny/backport_8176" Freeze columns only once per Result Preparing for 3.2.13.rc1 release Update CHANGELOGs for 3.2.13 release. Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md | ||||
| * | bumping to 3.2.13 | Aaron Patterson | 2013-03-18 | 1 | -1/+1 |
| | | |||||
| * | bumping to rc2 | Aaron Patterson | 2013-03-06 | 1 | -1/+1 |
| | | |||||
| * | Preparing for 3.2.13.rc1 release | Steve Klabnik | 2013-02-27 | 1 | -2/+2 |
| | | |||||
| * | Update CHANGELOGs for 3.2.13 release. | Steve Klabnik | 2013-02-27 | 1 | -0/+5 |
| | | |||||
* | | Update CHANGELOGs for 3.2.13.rc1 | Steve Klabnik | 2013-03-05 | 1 | -0/+5 |
|/ | |||||
* | Do not put the version in unreleased changes [ci skip] | Rafael Mendonça França | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Fix the CHANGELOG headers [ci skip] | Rafael Mendonça França | 2013-02-14 | 1 | -0/+5 |
| | |||||
* | Fixed changelog typos [ci skip] | Jon McCartie | 2013-02-14 | 1 | -1/+1 |
| | |||||
* | Update changelogs with version/release dates [ci skip] | Carlos Antonio da Silva | 2013-02-11 | 1 | -1/+3 |
| | |||||
* | Merge branch '3-2-sec' into 3-2-stable | Aaron Patterson | 2013-02-11 | 1 | -1/+1 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | bumping version | Aaron Patterson | 2013-02-10 | 1 | -1/+1 |
| | | |||||
* | | Update changelogs with release date [ci skip] | Carlos Antonio da Silva | 2013-01-09 | 1 | -1/+6 |
| | | |||||
* | | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2013-01-08 | 1 | -1/+1 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | * 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 | ||||
| * | bumping version | Aaron Patterson | 2013-01-08 | 1 | -1/+1 |
| | | |||||
* | | Merge tag 'v3.2.10' into 3-2-stable | Miguel | 2013-01-03 | 1 | -1/+1 |
|\| | | | | | | | Latest released tag was not fully merged into the stable branch (missed version bumping) | ||||
| * | bumping version to 3.2.10 | Aaron Patterson | 2012-12-23 | 1 | -1/+1 |
| | | |||||
* | | Add release date of 3.2.10 | Rafael Mendonça França | 2013-01-02 | 1 | -1/+6 |
| | | | | | | | | Fix format and wrong changelog entry | ||||
* | | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2012-12-23 | 1 | -1/+5 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 3-2-sec: CVE-2012-5664 options hashes should only be extracted if there are extra parameters updating changelog updating the changelogs updating the changelog for the CVE Add release date of Rails 3.2.9 to documentation Conflicts: actionmailer/CHANGELOG.md actionpack/CHANGELOG.md activemodel/CHANGELOG.md activerecord/CHANGELOG.md activeresource/CHANGELOG.md activesupport/CHANGELOG.md railties/CHANGELOG.md | ||||
| * | updating the changelogs | Aaron Patterson | 2012-12-23 | 1 | -0/+2 |
| | | |||||
| * | Add release date of Rails 3.2.9 to documentation | claudiob | 2012-12-23 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Conflicts: actionpack/CHANGELOG.md activerecord/CHANGELOG.md activesupport/CHANGELOG.md | ||||
* | | Backport #8450, the return value from mailer methods is not relevant. | Yves Senn | 2012-12-10 | 4 | -4/+30 |
| | | | | | | | | | | | | | | Conflicts: actionmailer/CHANGELOG.md actionmailer/lib/action_mailer/base.rb | ||||
* | | revised the actionmailer's CHANGELOG structure | Yves Senn | 2012-12-10 | 2 | -10/+13 |
| | | |||||
* | | Bump mailer to quiet the stdout log messages | Jeremy Kemper | 2012-12-04 | 1 | -1/+1 |
| | | | | | | | | | | Conflicts: actionmailer/actionmailer.gemspec | ||||
* | | Upgrade mail dependency to 2.5.2 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 |
| | | |||||
* | | Upgrade mail dependency to 2.5.0 | Mikel Lindsaar | 2012-11-18 | 1 | -1/+1 |
| | | |||||
* | | Add release date of Rails 3.2.9 to documentation | claudiob | 2012-11-12 | 1 | -1/+1 |
|/ | |||||
* | Bump to 3.2.9 | Santiago Pastorino | 2012-11-12 | 1 | -1/+1 |
| | |||||
* | Bump up to 3.2.9.rc3 | Santiago Pastorino | 2012-11-09 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.9.rc2 | Santiago Pastorino | 2012-11-01 | 1 | -1/+1 |
| | |||||
* | Bump to 3.2.9.rc1 | Santiago Pastorino | 2012-10-29 | 1 | -2/+2 |
| | |||||
* | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_call | Rafael Mendonça França | 2012-10-28 | 5 | -1/+34 |
| | | | | | | Do not render views when mail() isn't called. (NullMail refactoring) Conflicts: actionmailer/CHANGELOG.md | ||||
* | CHANGELOGs are now per branch | Xavier Noria | 2012-08-28 | 1 | -451/+1 |
| | | | | Check 810a50d for the rationale. | ||||
* | Bump to 3.2.8 | Santiago Pastorino | 2012-08-09 | 1 | -1/+1 |
| |