| Commit message (Expand) | Author | Age | Files | Lines |
... | |
| * | Fix javascript_include_tag when no js runtime is available | Noah Silas | 2013-01-07 | 3 | -9/+28 |
* | | Merge pull request #8735 from jejacks0n/duplicate_asset_fix | Guillermo Iguaran | 2013-01-10 | 5 | -2/+16 |
|\ \ |
|
| * | | Fixes issue where duplicate assets can be required with sprockets. | jejacks0n | 2013-01-10 | 5 | -2/+16 |
|/ / |
|
* | | Update changelogs with release date [ci skip] | Carlos Antonio da Silva | 2013-01-09 | 7 | -9/+35 |
* | | Merge pull request #8838 from yahonda/8806_3-2-stable | Rafael Mendonça França | 2013-01-09 | 2 | -13/+27 |
|\ \ |
|
| * | | Ignore binds payload with nil column in AR log subscriber | Yasuo Honda | 2013-01-09 | 2 | -13/+27 |
* | | | Merge pull request #8834 from sikachu/3-2-stable-fix-ars | Carlos Antonio da Silva | 2013-01-08 | 2 | -27/+0 |
|\ \ \
| |/ /
|/| | |
|
| * | | Remove test for XML YAML parsing | Prem Sichanugrist | 2013-01-08 | 2 | -27/+0 |
|/ / |
|
* | | Merge branch '3-2-sec' into 3-2-secmerge | Aaron Patterson | 2013-01-08 | 21 | -37/+147 |
|\ \ |
|
| * | | bumping version | Aaron Patterson | 2013-01-08 | 9 | -9/+9 |
| * | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. | Jeremy Kemper | 2013-01-08 | 4 | -13/+69 |
| * | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin... | Aaron Patterson | 2013-01-08 | 8 | -10/+67 |
| * | | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |
* | | | Changelog improvements [ci skip] | Carlos Antonio da Silva | 2013-01-08 | 1 | -6/+5 |
* | | | Bump rack dependency to 1.4.3 | Carlos Antonio da Silva | 2013-01-08 | 2 | -1/+5 |
* | | | Merge pull request #8812 from rubys/master | Carlos Antonio da Silva | 2013-01-08 | 1 | -1/+1 |
* | | | Wrap time ranges with timezones, closes #8807 | Vasiliy Ermolovich | 2013-01-08 | 5 | -43/+67 |
* | | | Avoid Rack security warning no secret provided | Santiago Pastorino | 2013-01-08 | 1 | -0/+2 |
* | | | Refactor write attribute logic to convert number column value | Carlos Antonio da Silva | 2013-01-07 | 1 | -4/+5 |
* | | | Remove not used variable in eager test | Carlos Antonio da Silva | 2013-01-07 | 1 | -1/+0 |
* | | | Fix named scope + class method example | Carlos Antonio da Silva | 2013-01-07 | 1 | -3/+1 |
* | | | connection_parameters is an Array and will never have | Rafael Mendonça França | 2013-01-06 | 1 | -2/+0 |
* | | | Test only with Ruby 1.9+ | Rafael Mendonça França | 2013-01-06 | 1 | -4/+6 |
* | | | Remove warnings | Rafael Mendonça França | 2013-01-06 | 1 | -2/+1 |
* | | | Fix error when assigning NaN to an integer column | Tristan Harward | 2013-01-06 | 3 | -8/+11 |
* | | | Do not call fields_for from form_for, to avoid instantiating two builders | Carlos Antonio da Silva | 2013-01-06 | 2 | -9/+19 |
* | | | Remove suggestion that Procs can be used as session secrets. | James Coglan | 2013-01-05 | 1 | -7/+4 |
* | | | Merge pull request #8763 from hsbt/backport-to-hide-warning | Carlos Antonio da Silva | 2013-01-04 | 1 | -1/+2 |
|\ \ \
| |_|/
|/| | |
|
| * | | backport #4f0f1b5 into 3-2-stable. because 1.9.3-p362 warned unused variables. | SHIBATA Hiroshi | 2013-01-05 | 1 | -1/+2 |
|/ / |
|
* | | Change the encrypted campfire notification token | Rafael Mendonça França | 2013-01-03 | 1 | -1/+1 |
* | | Merge pull request #8718 from jstirk/column_writer_to_i_errors | Rafael Mendonça França | 2013-01-03 | 4 | -8/+31 |
|\ \ |
|
| * | | Fix undefined method `to_i' introduced since 3.2.8 | Jason Stirk | 2013-01-04 | 4 | -8/+31 |
|/ / |
|
* | | Merge pull request #8733 from amatsuda/rails32_readme_dir_tree | Rafael Mendonça França | 2013-01-03 | 1 | -8/+8 |
|\ \ |
|
| * | | update directory tree in the generated README | Akira Matsuda | 2013-01-04 | 1 | -8/+8 |
|/ / |
|
* | | Merge pull request #8716 from miguelff/3-2-stable | Rafael Mendonça França | 2013-01-03 | 9 | -9/+9 |
|\ \ |
|
| * | | Merge tag 'v3.2.10' into 3-2-stable | Miguel | 2013-01-03 | 9 | -9/+9 |
| |\| |
|
| | * | bumping version to 3.2.10 | Aaron Patterson | 2012-12-23 | 9 | -9/+9 |
* | | | Merge pull request #8719 from pcasaretto/fix-actionview-doc-typo | Carlos Antonio da Silva | 2013-01-03 | 1 | -1/+1 |
|/ / |
|
* | | Use Ruby 1.8 syntax | Rafael Mendonça França | 2013-01-02 | 1 | -2/+2 |
* | | Merge pull request #8703 from senny/backport_8700 | Rafael Mendonça França | 2013-01-02 | 3 | -6/+33 |
|\ \ |
|
| * | | Backport #8701, do not append a second slash with `trailing_slash: true` | Yves Senn | 2013-01-02 | 3 | -6/+33 |
|/ / |
|
* | | Add release date of 3.2.10 | Rafael Mendonça França | 2013-01-02 | 7 | -14/+50 |
* | | Improve CHANGELOG message [ci skip] | Rafael Mendonça França | 2013-01-02 | 1 | -3/+2 |
* | | Merge branch '3-2-stable' into 3-2-secmerge | Aaron Patterson | 2013-01-02 | 8 | -272/+56 |
|\ \ |
|
| * \ | Merge pull request #8640 from jasl/3-2-stable | Rafael Mendonça França | 2013-01-02 | 3 | -1/+16 |
| |\ \ |
|
| | * | | fix block.arity raise nil error when not given a block to "content_tag_for" | jasl | 2013-01-02 | 3 | -1/+16 |
| * | | | removes the Ajax on Rails early draft | Xavier Noria | 2012-12-31 | 1 | -267/+0 |
| * | | | Revert "Merge pull request #8665 from senny/8661_should_not_append_charset_if... | Santiago Pastorino | 2012-12-31 | 4 | -27/+4 |
| * | | | Merge pull request #8665 from senny/8661_should_not_append_charset_if_already... | Santiago Pastorino | 2012-12-31 | 4 | -4/+27 |
| |\ \ \
| | |/ /
| |/| | |
|
| | * | | backport #8662, charset should not be appended for `head` responses | Yves Senn | 2012-12-31 | 4 | -4/+27 |
| |/ / |
|