aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Add Sass gobbling info to asset pipeline docsDavid Verhasselt2013-10-171-1/+5
| * | | Merge pull request #12564 from JuanitoFatas/association-basicsYves Senn2013-10-161-8/+8
| |\ \ \
| | * | | [ci skip] Fix number of methods added by association.Juanito Fatas2013-10-171-8/+8
| * | | | Ensure the state is clean after one failureRafael Mendonça França2013-10-161-5/+4
| * | | | Merge pull request #12540 from wyaeld/bug/fix-recursive-digestRafael Mendonça França2013-10-163-6/+37
| |\ \ \ \
| | * | | | add a new local variable to track if digests are being stored, to ensure the ...Brad Murray2013-10-171-2/+2
| | * | | | update digestor code based on reviewBrad Murray2013-10-151-2/+2
| | * | | | update changelogBrad Murray2013-10-151-0/+5
| | * | | | Ensure ActionView::Digest.cache is correctly cleaned up whenBrad Murray2013-10-151-6/+6
| | * | | | Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour causin...Brad Murray2013-10-151-0/+26
| * | | | | Merge pull request #12568 from adamyonk/patch-1Rafael Mendonça França2013-10-161-1/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Fix typo in form_helper.rbAdam Jahnke2013-10-161-1/+1
| |/ / / /
* | | | | @base_klass is not usedAaron Patterson2013-10-211-1/+0
* | | | | join_type isn't used on the node anymoreAaron Patterson2013-10-212-11/+7
* | | | | make joins generation method look similarAaron Patterson2013-10-211-6/+9
* | | | | remove node duping codeAaron Patterson2013-10-211-57/+19
* | | | | refactor outer join generationAaron Patterson2013-10-211-11/+6
* | | | | add outer joins for matching nodesAaron Patterson2013-10-211-2/+14
* | | | | construct joins by walking the outer join treeAaron Patterson2013-10-211-5/+34
* | | | | pass the outer joins to join_constraintsAaron Patterson2013-10-202-6/+3
* | | | | 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