aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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
| * | | | | | | | | | Merge pull request #12547 from derekprior/dp-fix-null-relation-pluckRafael Mendonça França2013-10-153-2/+9
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Pluck on NullRelation should accept a list of columns
| | * | | | | | | | | | Pluck on NullRelation accepts a list of columnsDerek Prior2013-10-153-2/+9
| | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `pluck` was updated to accept a list of columns, but the `NullRelation` was never updated to match that signature. As a result, calling `pluck` on a `NullRelation` results in an `ArgumentError`.
* | | | | | | | | | | Merge branch 'master' into joindepAaron Patterson2013-10-1556-203/+365
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * master: (44 commits) grammar fix (reverted in e9a1ecd) Revert "fixed a doc bug in the CHANGELOG.md s/does no longer depend on/no longer depends on/" Add missed require making `enable_warnings` available Prepare generated Gemfile for Capistrano 3 Added --model-name option scaffold_controller_generator. read the association instead of sending we should have unique sponsorable ids in the fixtures at least simplify populating the ordering hash the preloader for the RHS has all the preloaded records, so ask it only calculate offset index once. #12537 Remove size alias for length validation Fix `singleton_class?` Minor Refactoring to `NumberHelper#number_to_human` `$SAFE = 4;` has been removed with Ruby 2.1 scope_chain should not be mutated for other reflections Remove `default_primary_key_type` and extract contains of `native_database_types` to a constant since they aren't conditional now in SQLite3Adapter. Makes it more like other adapters. cleanup changelog entry format. [ci skip] Extract a function to determine if the default value is a function Push default_function to superclass to avoid method check Dump the default function when the primary key is uuid ... Conflicts: activerecord/lib/active_record/relation/finder_methods.rb
| * | | | | | | | | | 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 ↵Vijay Dev2013-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | longer depends on/" This reverts commit 49f513c25415f94452af1bb8fe3f55f090a6d0f2. Reason: Changelogs aren't supposed to be edited in docrails.
| | * | | | | | | | | 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 ↵Zachary Scott2013-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | depends on/
| * | | | | | | | | | Merge pull request #12524 from kirs/patch-1Rafael Mendonça França2013-10-151-1/+1
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Prepare generated Gemfile for Capistrano 3
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-21 14:17:31 +0000