aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #8716 from miguelff/3-2-stableRafael Mendonça França2013-01-039-9/+9
|\ \
| * | Merge tag 'v3.2.10' into 3-2-stableMiguel2013-01-039-9/+9
| |\|
| | * bumping version to 3.2.10Aaron Patterson2012-12-239-9/+9
* | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typoCarlos Antonio da Silva2013-01-031-1/+1
|/ /
* | Use Ruby 1.8 syntaxRafael Mendonça França2013-01-021-2/+2
* | Merge pull request #8703 from senny/backport_8700Rafael Mendonça França2013-01-023-6/+33
|\ \
| * | Backport #8701, do not append a second slash with `trailing_slash: true`Yves Senn2013-01-023-6/+33
|/ /
* | Add release date of 3.2.10Rafael Mendonça França2013-01-027-14/+50
* | Improve CHANGELOG message [ci skip]Rafael Mendonça França2013-01-021-3/+2
* | Merge branch '3-2-stable' into 3-2-secmergeAaron Patterson2013-01-028-272/+56
|\ \
| * \ Merge pull request #8640 from jasl/3-2-stableRafael Mendonça França2013-01-023-1/+16
| |\ \
| | * | fix block.arity raise nil error when not given a block to "content_tag_for"jasl2013-01-023-1/+16
| * | | removes the Ajax on Rails early draftXavier Noria2012-12-311-267/+0
| * | | Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if...Santiago Pastorino2012-12-314-27/+4
| * | | Merge pull request #8665 from senny/8661_should_not_append_charset_if_already...Santiago Pastorino2012-12-314-4/+27
| |\ \ \ | | |/ / | |/| |
| | * | backport #8662, charset should not be appended for `head` responsesYves Senn2012-12-314-4/+27
| |/ /
| * | Revert "Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` optio...Rafael Mendonça França2012-12-263-42/+3
| * | Fix `validates_presence_of` with `:allow_nil` or `:allow_blank` options.Rafael Mendonça França2012-12-263-3/+42
| * | Merge pull request #8618 from senny/backport_8612Rafael Mendonça França2012-12-264-4/+40
| |\ \
| | * | backport #8616, quote column names in generated fixture filesYves Senn2012-12-264-4/+40
| |/ /
* | | Merge branch '3-2-sec' into 3-2-secmergeAaron Patterson2012-12-239-6/+47
|\ \ \ | |/ / |/| / | |/
| * CVE-2012-5664 options hashes should only be extracted if there are extra para...Aaron Patterson2012-12-232-1/+18
| * updating changelogAaron Patterson2012-12-231-1/+2
| * updating the changelogsAaron Patterson2012-12-235-0/+10
| * updating the changelog for the CVEAaron Patterson2012-12-231-0/+4
| * Add release date of Rails 3.2.9 to documentationclaudiob2012-12-237-7/+7
* | Serialized attribute can be serialized in an integer columnRafael Mendonça França2012-12-215-6/+49
* | Merge pull request #8558 from senny/backport_3489Carlos Antonio da Silva2012-12-193-1/+19
|\ \
| * | Backport #8522, Keep index names when using with sqlite3Yves Senn2012-12-193-1/+19
|/ /
* | Use 1.8 style hash in json encoding testCarlos Antonio da Silva2012-12-141-1/+1
* | Remove unicode character encoding from ActiveSupport::JSON.encodeBrett Carter2012-12-143-10/+24
* | Don't use 1.9 hash syntax on 3-2-stableAndrew White2012-12-142-14/+14
* | Clear url helper methods when routes are reloadedAndrew White2012-12-144-6/+175
* | Merge pull request #8504 from senny/backport_8492Carlos Antonio da Silva2012-12-134-1/+24
|\ \
| * | recognize migrations, in folders containing numbers and 'rb'.Yves Senn2012-12-134-1/+24
|/ /
* | Merge pull request #8490 from mattv/fix_request_raw_postRafael Mendonça França2012-12-113-2/+15
* | Improve test name related to cache timestamp format [ci skip]Carlos Antonio da Silva2012-12-111-1/+1
* | Add :nsec format only for Ruby 1.9Carlos Antonio da Silva2012-12-114-10/+16
* | Run backported serialized test without Identity MapCarlos Antonio da Silva2012-12-111-2/+4
* | Use 1.8 hash style :bomb:Carlos Antonio da Silva2012-12-111-2/+2
* | Merge pull request #8441 from itzki/fix_decorate_columnsCarlos Antonio da Silva2012-12-111-0/+13
* | Add CHANGELOG entry for #6376.Rafael Mendonça França2012-12-101-0/+4
* | Allow users to choose the timestamp format in the cache keyRafael Mendonça França2012-12-105-2/+36
* | Make sure the tests pass in the case closer to described in #8195Rafael Mendonça França2012-12-104-19/+14
* | Merge pull request #6376 from jgaskins/timestamp-microsecondsJeremy Kemper2012-12-104-3/+6
* | Added regression test for #8195.jacobstr2012-12-101-0/+18
* | Remove warning of unused variableRafael Mendonça França2012-12-101-1/+1
* | Merge pull request #8477 from senny/backport_8448Rafael Mendonça França2012-12-104-14/+43
|\ \
| * | Backport #8450, the return value from mailer methods is not relevant.Yves Senn2012-12-104-4/+30
| * | revised the actionmailer's CHANGELOG structureYves Senn2012-12-102-10/+13
|/ /