aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* disconnect join_constraints from the instanceAaron Patterson2013-10-202-3/+3
* pass in scope chain so reflection is not neededAaron Patterson2013-10-202-3/+3
* pass the foreign table and class to the join_constraints methodAaron Patterson2013-10-202-5/+4
* pass the join type to the join_constraints methodAaron Patterson2013-10-202-2/+3
* Merge branch 'master' into joindepAaron Patterson2013-10-164-108/+13
|\
| * Merge pull request #12545 from nateberkopec/rephrase_callback_warningYves Senn2013-10-161-1/+1
| |\
| | * Rephrase ActiveRecord transaction rollback warningNate Berkopec2013-10-161-1/+1
| * | Merge pull request #12558 from lucasmazza/changelog-fixesRafael Mendonça França2013-10-162-12/+12
| |\ \
| | * | Fix code blocks identation on AR and AS CHANGELOGsLucas Mazza2013-10-162-12/+12
| |/ /
| * | Merge pull request #12553 from tchandy/masterGuillermo Iguaran2013-10-151-95/+0
| |\ \
| | * | Removing unused fake models from actionpack testsThiago Pradi2013-10-161-95/+0
| |/ /
* | | use the node as cache so we can avoid accessing the tableAaron Patterson2013-10-151-13/+13
* | | apply tables to the whole tree from the outsideAaron Patterson2013-10-151-14/+8
* | | apply table aliases after the AST has been builtAaron Patterson2013-10-151-1/+13
* | | stop reversing tables until we absolutely mustAaron Patterson2013-10-152-3/+3
* | | pass the chain the join_constraintsAaron Patterson2013-10-152-3/+4
* | | Merge branch 'master' into joindepAaron Patterson2013-10-156-5/+12
|\| |
| * | use the cached arel tableAaron Patterson2013-10-152-2/+2
| * | Fix typo in the changelog entryRafael Mendonça França2013-10-151-1/+1
| * | Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
| * | Merge pull request #12547 from derekprior/dp-fix-null-relation-pluckRafael Mendonça França2013-10-153-2/+9
| |\ \
| | * | Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-153-2/+9
| | |/
* | | Merge branch 'master' into joindepAaron Patterson2013-10-1556-203/+365
|\| |
| * | grammar fix (reverted in e9a1ecd)Vijay Dev2013-10-151-1/+1
| * | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-10-151-1/+1
| |\ \ | | |/ | |/|
| | * Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no lon...Vijay Dev2013-10-151-1/+1
| | * Use ActiveRecord::Base#update! instead of #update_attributes!Zachary Scott2013-09-281-1/+1
| | * fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depe...Zachary Scott2013-09-281-1/+1
| * | Merge pull request #12524 from kirs/patch-1Rafael Mendonça França2013-10-151-1/+1
| |\ \
| | * | Prepare generated Gemfile for Capistrano 3Kir Shatrov2013-10-151-1/+1
| * | | Merge pull request #12543 from route/missed_requireRafael Mendonça França2013-10-151-0/+1
| |\ \ \
| | * | | Add missed require making `enable_warnings` availableDmitry Vorotilin2013-10-151-0/+1
| |/ / /
| * | | Merge pull request #11432 from yalab/generate_model_name_optionYves Senn2013-10-155-6/+53
| |\ \ \
| | * | | Added --model-name option scaffold_controller_generator.yalab2013-10-155-6/+53
| |/ / /
| * | | Merge pull request #12534 from vipulnsward/minor_number_helper_perfsRafael Mendonça França2013-10-141-4/+2
| |\ \ \
| | * | | Minor Refactoring to `NumberHelper#number_to_human`Vipul A M2013-10-141-4/+2
| * | | | read the association instead of sendingAaron Patterson2013-10-141-1/+3
| * | | | we should have unique sponsorable ids in the fixtures at leastAaron Patterson2013-10-141-1/+1
| * | | | Merge pull request #12536 from sbagdat/patch-1Rafael Mendonça França2013-10-141-2/+0
| |\ \ \ \
| | * | | | Remove size alias for length validationSıtkı Bağdat2013-10-141-2/+0
| | |/ / /
| * | | | simplify populating the ordering hashAaron Patterson2013-10-141-10/+5
| * | | | the preloader for the RHS has all the preloaded records, so ask itAaron Patterson2013-10-141-3/+3
| * | | | only calculate offset index once. #12537Aaron Patterson2013-10-141-6/+10
| * | | | Merge pull request #10538 from neerajdotname/3882Rafael Mendonça França2013-10-149-1/+65
| |\ \ \ \
| | * | | | scope_chain should not be mutated for other reflectionsNeeraj Singh2013-10-149-1/+65
| * | | | | Merge pull request #12532 from vipulnsward/singleton_classRafael Mendonça França2013-10-141-2/+5
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix `singleton_class?`Vipul A M2013-10-151-2/+5
| |/ / / /
| * | | | Merge pull request #12530 from vipulnsward/remove_thread_safeRafael Mendonça França2013-10-141-13/+0
| |\ \ \ \
| | * | | | `$SAFE = 4;` has been removed with Ruby 2.1Vipul A M2013-10-141-13/+0
| |/ / / /
| * | | | Merge pull request #12527 from vipulnsward/sqlite_database_typesRafael Mendonça França2013-10-141-18/+16
| |\ \ \ \ | | |/ / / | |/| | |