aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge pull request #12533 from szimek/use_exists_in_relation_emptySantiago Pastorino2013-10-192-2/+5
| |\ \ \ | | |/ / | |/| | In Relation#empty? use #exists? instead of #count.
| | * | In Relation#empty? use #exists? instead of #count.Szymon Nowak2013-10-192-2/+5
| |/ /
| * | Merge pull request #12560 from sue445/modify_find_lock_sample_codeYves Senn2013-10-181-3/+3
| |\ \ | | | | | | | | avoid deprecation warning in sample code [ci skip]
| | * | [ci skip] avoid deprecation warning in sample codesue4452013-10-181-3/+3
| | | | | | | | | | | | | | | | | | | | Account.find(1, lock: true) -> DEPRECATION WARNING: Passing options to #find is deprecated. Please build a scope and then call #find on it.
| * | | Merge pull request #11839 from chocoby/fix/convert_port_numberYves Senn2013-10-183-1/+15
| |\ \ \ | | | | | | | | | | Convert Fixnum into String the port number like `db:structure:dump` task in MySQL.
| | * | | Convert Fixnum into String the port number in MySQLKenta Okamoto2013-10-183-1/+15
| |/ / /
| * | | Merge pull request #12569 from arthurnn/autosave_small_cleanipRafael Mendonça França2013-10-171-196/+196
| |\ \ \ | | | | | | | | | | Small cleanup on autosave association
| | * | | Fix some indentation on autosave associationArthur Neves2013-10-171-196/+196
| | | | |
| | * | | Make define_non_cyclic_method simplerArthur Neves2013-10-171-7/+7
| | | | |
| * | | | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docsYves Senn2013-10-171-1/+5
| |\ \ \ \ | | |/ / / | |/| | | Add sass globbing to asset pipeline docs [ci skip]
| | * | | Add Sass gobbling info to asset pipeline docsDavid Verhasselt2013-10-171-1/+5
| | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | Merge pull request #12564 from JuanitoFatas/association-basicsYves Senn2013-10-161-8/+8
| |\ \ \ \ | | | | | | | | | | | | [ci skip] Fix number of methods added by association.
| | * | | | [ci skip] Fix number of methods added by association.Juanito Fatas2013-10-171-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Also clean up some trailing spaces on line 1143-1146.
| * | | | | 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
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Ensure ActionView::Digestor.cache is correctly cleaned up
| | * | | | | add a new local variable to track if digests are being stored, to ensure the ↵Brad Murray2013-10-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup works correctly
| | * | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Resolver.caching = false.
| | * | | | | Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour ↵Brad Murray2013-10-151-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | causing #12521 If config.action_view.cache_template_loading = false, most likely in a development configuration if config.cache_classes = false & config.action_controller.perform_caching = true. config.action_view.cache_template_loading defaults to the value of config.cache_classes
| * | | | | | Merge pull request #12568 from adamyonk/patch-1Rafael Mendonça França2013-10-161-1/+1
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | Fix typo in form_helper.rb
| | * | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: Rephrase ActiveRecord transaction rollback warning Fix code blocks identation on AR and AS CHANGELOGs Removing unused fake models from actionpack tests
| * | | | | Merge pull request #12545 from nateberkopec/rephrase_callback_warningYves Senn2013-10-161-1/+1
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | Rephrase ActiveRecord transaction rollback warning [ci skip]
| | * | | | Rephrase ActiveRecord transaction rollback warningNate Berkopec2013-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Merge pull request #12558 from lucasmazza/changelog-fixesRafael Mendonça França2013-10-162-12/+12
| |\ \ \ \ \ | | | | | | | | | | | | | | Fix code blocks identation on AR and AS CHANGELOGs
| | * | | | | 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 tests
| | * | | | | 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
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: use the cached arel table Fix typo in the changelog entry Don't remove the select values to add they back again Pluck on NullRelation accepts a list of columns Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
| * | | | | use the cached arel tableAaron Patterson2013-10-152-2/+2
| | | | | |
| * | | | | Fix typo in the changelog entryRafael Mendonça França2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | [ci skip]
| * | | | | Don't remove the select values to add they back againRafael Mendonça França2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/finder_methods.rb