aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixing call to columns hash. run the damn tests when you backport!Aaron Patterson2013-02-091-1/+1
* Bump rack dependency to 1.4.5Santiago Pastorino2013-02-091-1/+1
* Merge pull request #9224 from dylanahsmith/bigdecimal-takes-stringGuillermo Iguaran2013-02-091-1/+1
* Merge pull request #9208 from dylanahsmith/3-2-mysql-quote-numericGuillermo Iguaran2013-02-098-15/+62
* bumping versionAaron Patterson2013-01-089-9/+9
* CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-084-13/+69
* * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealin...Aaron Patterson2013-01-088-10/+67
* Avoid Rack security warning no secret providedSantiago Pastorino2013-01-081-0/+2
* bumping version to 3.2.10Aaron Patterson2012-12-239-9/+9
* 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
* Bump to 3.2.9Santiago Pastorino2012-11-129-9/+9
* Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
* Bump up to 3.2.9.rc3Santiago Pastorino2012-11-099-9/+9
* Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
* Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
* Clear url helpers when reloading routesSantiago Pastorino2012-11-022-0/+5
* Add test to avoid regression of 4a86362Rafael Mendonça França2012-11-021-0/+10
* Revert "Merge pull request #7668 from Draiken/fix_issue_6497"Rafael Mendonça França2012-11-023-18/+7
* Bump to 3.2.9.rc2Santiago Pastorino2012-11-019-9/+9
* Ensure calling first/last with options correctly set inverse associationCarlos Antonio da Silva2012-11-012-1/+11
* Fix issue with collection associations and first(n)/last(n)Carlos Antonio da Silva2012-11-013-3/+20
* relaxes assertionXavier Noria2012-10-311-1/+1
* Merge pull request #8083 from saks/fix_update_column_return_valueJosé Valim2012-10-312-1/+7
|\
| * Fix ActiveRecord#update_column return valuesaksmlz2012-10-312-1/+7
|/
* Revert "Merge pull request #7659 from HugoLnx/template_error_no_matches_rebased"Rafael Mendonça França2012-10-314-37/+14
* Revert "Merge pull request #7797 from senny/7459_prefix_tempalte_assertion_va...Rafael Mendonça França2012-10-303-23/+31
* Add CHANGELOG entry to #8032 fixRafael Mendonça França2012-10-291-0/+5
* Fix typo :bomb: [ci skip]Rafael Mendonça França2012-10-291-1/+1
* Fix bug when Column is trying to type cast boolean values to integer.Rafael Mendonça França2012-10-293-6/+22
* Merge pull request #8009 from graceliu/3-2-fix_database_url_supportRafael Mendonça França2012-10-296-37/+287
|\
| * fixed support for DATABASE_URL for rake db tasksGrace Liu2012-10-296-37/+287
* | Bump to 3.2.9.rc1Santiago Pastorino2012-10-299-17/+17
|/
* Add 3.2.9 section in ARes CHANGELOGSantiago Pastorino2012-10-291-0/+4
* Revert "Deprecate Paths::Path#children which is unused now"Rafael Mendonça França2012-10-291-1/+0
* Merge pull request #7587 from elia/fix-too-eager-loadingRafael Mendonça França2012-10-293-6/+17
|\
| * Deprecate Paths::Path#children which is unused nowElia Schito2012-10-291-0/+1
| * Respect children paths filter settingsElia Schito2012-10-282-6/+13
| * Add test case to assets eager loadRafael Mendonça França2012-10-271-0/+3
* | Merge pull request #8057 from frodsan/fix_sqlite_mutate_argRafael Mendonça França2012-10-292-1/+9
* | Merge pull request #8053 from henrik/update_columns_with_primary_keyCarlos Antonio da Silva2012-10-293-1/+17
* | Make Active Record tests pass in isolationRafael Mendonça França2012-10-292-3/+2
* | Fix the skip code.Rafael Mendonça França2012-10-281-4/+4
* | Merge pull request #7593 from veader/patch-1Rafael Mendonça França2012-10-283-0/+14
* | Merge pull request #8048 from senny/7761_dont_render_view_without_mail_callRafael Mendonça França2012-10-285-1/+34
* | Merge pull request #8047 from arunagw/json_only_in_18Carlos Antonio da Silva2012-10-281-1/+0
|\ \
| * | Removing JSON for other rubyArun Agrawal2012-10-281-1/+0
|/ /