aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* Fix merge conflicts from #19501Sean Griffin2015-10-294-23/+28
|\
| * DRY up STI subclass logicCody Cutrer2015-03-244-22/+29
* | tests, no every adapter supports "connection.version"Yves Senn2015-10-292-22/+24
* | Merge pull request #18548 from sebjacobs/support-bidirectional-destroy-depend...Sean Griffin2015-10-287-0/+116
|\ \
| * | Add support for bidirectional destroy dependenciesSeb Jacobs2015-01-167-1/+119
* | | Fix Typo in EagerLoadPolymorphicError [ci skip]Alex Myers2015-10-271-1/+1
* | | Merge pull request #18383 from scambra/habtm-with-where-includes-16032-for-ma...Rafael Mendonça França2015-10-273-1/+40
|\ \ \
| * | | Includes HABTM returns correct size now. It's caused by the join dependencySergio Cambra2015-01-073-2/+41
* | | | fix typo in `db:purge` description [ci skip]yuuji.yaginuma2015-10-281-1/+1
* | | | [ci skip] Aline code examples in AR changelogyui-knk2015-10-271-17/+14
* | | | Revert "Merge pull request #21994 from mtodd/inherit-scopes"Rafael Mendonça França2015-10-272-3/+3
* | | | Make inherited scope test failMatt Todd2015-10-262-3/+3
* | | | [ci skip] Add doc for preloader_forschneems2015-10-261-0/+4
* | | | [ci skip] Clarify doc for preloaders_for_oneschneems2015-10-261-0/+5
* | | | [ci skip] Add doc to preloaders_onschneems2015-10-261-0/+1
* | | | Merge pull request #19686 from tsun1215/index_errorsSean Griffin2015-10-267-4/+91
|\ \ \ \
| * | | | Errors can be indexed with nested attributesMichael Probber2015-04-177-4/+91
* | | | | Merge pull request #19924 from iamvery/db-tasks-exit-statusSean Griffin2015-10-265-5/+15
|\ \ \ \ \
| * | | | | Update changelog with db rake task exit status fixJay Hayes2015-10-201-0/+4
| * | | | | Exit with non-zero status when db:drop failsJay Hayes2015-10-201-1/+2
| * | | | | Exit with non-zero status when db:create failsJay Hayes2015-10-203-3/+4
| * | | | | Fix test of drop failureJay Hayes2015-10-201-1/+5
* | | | | | [ci skip] Fix method documentation locationschneems2015-10-261-3/+2
* | | | | | Merge pull request #22064 from kamipo/do_not_omit_parenthesesSean Griffin2015-10-253-13/+13
|\ \ \ \ \ \
| * | | | | | Do not omit parentheses [ci skip]Ryuta Kamizono2015-10-253-13/+13
* | | | | | | Tweaked wording used in some tests.Sebastian McKenzie2015-10-251-4/+4
|/ / / / / /
* | | | | | Stop aligning the argumentsRafael Mendonça França2015-10-231-4/+4
* | | | | | Use thor class_option to make the primary_key_type option workRafael Mendonça França2015-10-234-10/+10
* | | | | | Move default uuid generation to active_recordJon McCartie2015-10-233-3/+12
* | | | | | Remove no need `binds.empty?` checkingRyuta Kamizono2015-10-231-3/+3
* | | | | | Merge pull request #21918 from bogdan/refactor-preloaderSean Griffin2015-10-221-42/+30
|\ \ \ \ \ \
| * | | | | | Refactored association preloader for performanceBogdan Gusiev2015-10-221-42/+30
* | | | | | | Merge pull request #21950 from rafaelsales/issues/21922-fix-ar-group-by-attri...Andrew White2015-10-224-11/+17
|\ \ \ \ \ \ \
| * | | | | | | Refactor Calculations#execute_grouped_calculation and clean AR test caseRafael Sales2015-10-222-11/+4
| * | | | | | | Fix generated projection fields in group by queryRafael Sales2015-10-223-1/+14
* | | | | | | | Remove `#tables` extra args againRyuta Kamizono2015-10-224-24/+14
|/ / / / / / /
* | | | | | | Extract native getter to attr_reader.jbranchaud2015-10-211-5/+1
* | | | | | | move documentation of column options to `add_column`. Closes #20400.Yves Senn2015-10-212-79/+81
* | | | | | | typoScott Nelson2015-10-201-1/+1
| |/ / / / / |/| | | | |
* | | | | | Fix merge conflicts for #19938Sean Griffin2015-10-206-6/+29
|\ \ \ \ \ \
| * | | | | | Fix for activerecord join dependency instantiate bugMehmet Emin İNAÇ2015-05-046-6/+29
* | | | | | | Merge pull request #20653 from repinel/allow-arel-select-countSean Griffin2015-10-202-1/+55
|\ \ \ \ \ \ \
| * | | | | | | Allow select with Arel and count as well as calculations with ArelRoque Pinel2015-06-302-1/+55
* | | | | | | | Merge pull request #21762 from jmccartie/jm/uuidSean Griffin2015-10-202-1/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | Set active_record config for always creating uuids in generatorsJon McCartie2015-10-202-1/+8
* | | | | | | | | Merge pull request #20934 from maurogeorge/migration-transformations-docSean Griffin2015-10-201-15/+51
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missed Available transformations to migration DocMauro George2015-07-221-15/+50
* | | | | | | | | | Merge pull request #20957 from akihiro17/find-by-issueSean Griffin2015-10-203-1/+13
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Don't cache arguments in #find_by if they are an ActiveRecord::Relationakihiro172015-10-063-1/+13
* | | | | | | | | | Fix test failures caused by d99db6b8b3e4Sean Griffin2015-10-201-1/+1