AtHeartEngineer/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-08 22:27:59 -05:00
Code Issues Packages Projects Releases Wiki Activity
28,542 Commits 34 Branches 105 Tags
3-2-github
Commit Graph

947 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
538f8ba0c1 updating changelogs 2013-10-16 10:01:01 -07: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
47fb44fc7a Update CHANGELOG entry 2013-07-22 11:57:02 -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
Rafael Mendonça França
2ce875dfbd Add license to the gemspec 2013-07-08 14:51:19 -03:00
Rafael Mendonça França
b0f96d4436 Merge pull request #10646 from kennyj/fix_am_20130517 
Fix ActionMailer testcase break with mail 2.5.4.
Conflicts:
	actionmailer/CHANGELOG.md
	actionmailer/test/mailers/base_mailer.rb
 2013-05-20 15:50:36 -03:00
Mikel Lindsaar
010ea715f2 Update mail to minimum version 2.5.4 2013-05-14 15:01:31 +10:00
claudiob
0e56c1de70 Add release dates to documentation [ci skip] 
Set "March 18, 2013" as the release date for 3.2.13
 2013-03-18 14:51:46 -07:00
Aaron Patterson
afcd01bf25 Merge branch '3-2-13' into 3-2-stable 
* 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
 2013-03-18 10:17:04 -07: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
51ae6f4bb1 Update CHANGELOGs for 3.2.13.rc1 2013-03-05 11:22:55 -08:00
Steve Klabnik
5ca59b02d1 Preparing for 3.2.13.rc1 release 2013-02-27 12:19:06 -08:00
Steve Klabnik
23434f6162 Update CHANGELOGs for 3.2.13 release. 2013-02-27 10:06:45 -08:00
Rafael Mendonça França
de83b017a9 Do not put the version in unreleased changes [ci skip] 2013-02-14 15:46:28 -02:00
Rafael Mendonça França
b9720355d0 Fix the CHANGELOG headers [ci skip] 2013-02-14 15:36:45 -02:00
Jon McCartie
f15581b1ba Fixed changelog typos [ci skip] 2013-02-14 09:36:33 -06:00
Carlos Antonio da Silva
e0da95bd7e Update changelogs with version/release dates [ci skip] 2013-02-11 23:33:01 -02: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
Carlos Antonio da Silva
11f5debcd5 Update changelogs with release date [ci skip] 2013-01-09 20:06:06 -02: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
Rafael Mendonça França
f4dc7e3676 Add release date of 3.2.10 
Fix format and wrong changelog entry
 2013-01-02 18:51:13 -03:00
Aaron Patterson
8ba3df046f bumping version to 3.2.10 2012-12-23 13:36:49 -08:00
Aaron Patterson
2aa70bd61a Merge branch '3-2-sec' into 3-2-secmerge 
* 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
 2012-12-23 11:52:05 -08:00
Aaron Patterson
6727ac6a6b updating the changelogs 2012-12-23 10:59:39 -08:00
claudiob
acc2aa4c60 Add release date of Rails 3.2.9 to documentation 
Conflicts:
	actionpack/CHANGELOG.md
	activerecord/CHANGELOG.md
	activesupport/CHANGELOG.md
 2012-12-23 10:59:19 -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
Jeremy Kemper
dac811e854 Bump mailer to quiet the stdout log messages 
Conflicts:
	actionmailer/actionmailer.gemspec
 2012-12-04 08:37:57 -02:00
Mikel Lindsaar
b18fc59d28 Upgrade mail dependency to 2.5.2 2012-11-18 15:55:33 +11:00
Mikel Lindsaar
a497f84bb2 Upgrade mail dependency to 2.5.0 2012-11-18 10:43:48 +11:00
claudiob
69455e7f6a Add release date of Rails 3.2.9 to documentation 2012-11-12 16:07:36 -08: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