aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* use bind values for join columnsAaron Patterson2012-11-106-12/+36
* Revert "Add test case to assets eager load"Santiago Pastorino2012-11-091-3/+0
* Merge branch '3-2-9' into 3-2-stableSantiago Pastorino2012-11-099-9/+9
|\
| * 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
* | Merge pull request #8161 from guilleiguaran/downgrade-sprocketsRafael Mendonça França2012-11-091-1/+1
|\ \
| * | Lock sprockets to 2.2.xGuillermo Iguaran2012-11-091-1/+1
| |/
* | Fix redirect example blockCarlos Antonio da Silva2012-11-091-3/+3
* | Revert "Respect children paths filter settings"Santiago Pastorino2012-11-092-13/+6
* | Merge pull request #8082 from nikitug/backport_serialized_attributes_before_t...Carlos Antonio da Silva2012-11-093-0/+24
|\ \
| * | Backport #8078: Fix `attributes_before_type_cast` for serialised attributes.Nikita Afanasenko2012-11-093-0/+24
|/ /
* | Merge pull request #8093 from nikitug/keep_app_x_ua_compatibleCarlos Antonio da Silva2012-11-083-1/+46
* | 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