aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge pull request #8027 from daenney/masterXavier Noria2012-11-083-3/+17
* | | Merge pull request #8149 from senny/backport_7842_to_rails_3_2_stableRafael Mendonça França2012-11-083-1/+11
|\ \ \
| * | | backport, handle trailing slash with enginesYves Senn2012-11-083-1/+11
|/ / /
* | | Merge pull request #7987 from alexisbernard/3-2_find_in_batches_compatible_wi...Santiago Pastorino2012-11-083-3/+28
|\ \ \
| * | | Fix find_in_batches against string IDs when start option is not specified.Alexis Bernard2012-11-083-2/+15
| * | | Fix test_find_in_batches_should_use_any_column_as_primary_keySantiago Pastorino2012-11-081-11/+8
| * | | start could be a stringSantiago Pastorino2012-11-082-1/+16
| |/ /
* | | Use a more descriptive test nameRafael Mendonça França2012-11-081-1/+1
* | | Fix the release in the CHANGELOG [ci skip]Rafael Mendonça França2012-11-081-1/+4
* | | Merge pull request #8108 from Casecommons/fix-multiple-and-index-in-instance-tagRafael Mendonça França2012-11-083-1/+34
* | | Merge pull request #8138 from sobrinho/3-2-stableRafael Mendonça França2012-11-083-3/+41
|\ \ \ | |/ / |/| |
| * | Fix accepts_nested_attributes for child classesGabriel Sobrinho & Ricardo Henrique2012-11-073-3/+41
|/ /
* | 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
|/ / /
* / / Merge pull request #8038 from frodsan/fix_am_serializers_xml_dependencyJeremy Kemper2012-10-274-5/+6
|/ /
* | Merge pull request #8022 from GRoguelon/3-2-stableRafael Mendonça França2012-10-241-1/+1
|\ \
| * | Adding a missing parenthesis in the doc of String#parameterize.Geoffrey Roguelon2012-10-241-1/+1
* | | frozen state should be restored after txn is abortedAaron Patterson2012-10-222-2/+18
* | | Merge pull request #7986 from Grandrath/patch-2Carlos Antonio da Silva2012-10-201-1/+1
|\ \ \
| * | | Use `Rails.env` instead of `ENV['RAILS_ENV']`; #7951Martin Grandrath2012-10-181-1/+1
* | | | Require ActionController::Railtie in the default middleware stack.Rafael Mendonça França2012-10-181-0/+2