Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge pull request #11839 from chocoby/fix/convert_port_number | Yves Senn | 2013-10-18 | 3 | -1/+15 | |
| |\ \ \ | | | | | | | | | | | Convert Fixnum into String the port number like `db:structure:dump` task in MySQL. | |||||
| | * | | | Convert Fixnum into String the port number in MySQL | Kenta Okamoto | 2013-10-18 | 3 | -1/+15 | |
| |/ / / | ||||||
| * | | | Merge pull request #12569 from arthurnn/autosave_small_cleanip | Rafael Mendonça França | 2013-10-17 | 1 | -196/+196 | |
| |\ \ \ | | | | | | | | | | | Small cleanup on autosave association | |||||
| | * | | | Fix some indentation on autosave association | Arthur Neves | 2013-10-17 | 1 | -196/+196 | |
| | | | | | ||||||
| | * | | | Make define_non_cyclic_method simpler | Arthur Neves | 2013-10-17 | 1 | -7/+7 | |
| | | | | | ||||||
| * | | | | Merge pull request #12218 from dv/add-sass-globbing-to-asset-pipeline-docs | Yves Senn | 2013-10-17 | 1 | -1/+5 | |
| |\ \ \ \ | | |/ / / | |/| | | | Add sass globbing to asset pipeline docs [ci skip] | |||||
| | * | | | Add Sass gobbling info to asset pipeline docs | David Verhasselt | 2013-10-17 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | Merge pull request #12564 from JuanitoFatas/association-basics | Yves Senn | 2013-10-16 | 1 | -8/+8 | |
| |\ \ \ \ | | | | | | | | | | | | | [ci skip] Fix number of methods added by association. | |||||
| | * | | | | [ci skip] Fix number of methods added by association. | Juanito Fatas | 2013-10-17 | 1 | -8/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Also clean up some trailing spaces on line 1143-1146. | |||||
| * | | | | | Ensure the state is clean after one failure | Rafael Mendonça França | 2013-10-16 | 1 | -5/+4 | |
| | | | | | | ||||||
| * | | | | | Merge pull request #12540 from wyaeld/bug/fix-recursive-digest | Rafael Mendonça França | 2013-10-16 | 3 | -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 Murray | 2013-10-17 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | cleanup works correctly | |||||
| | * | | | | | update digestor code based on review | Brad Murray | 2013-10-15 | 1 | -2/+2 | |
| | | | | | | | ||||||
| | * | | | | | update changelog | Brad Murray | 2013-10-15 | 1 | -0/+5 | |
| | | | | | | | ||||||
| | * | | | | | Ensure ActionView::Digest.cache is correctly cleaned up when | Brad Murray | 2013-10-15 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Resolver.caching = false. | |||||
| | * | | | | | Add 2 tests, 1 of which fails, to isolate the digest_caching behaviour ↵ | Brad Murray | 2013-10-15 | 1 | -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-1 | Rafael Mendonça França | 2013-10-16 | 1 | -1/+1 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | Fix typo in form_helper.rb | |||||
| | * | | | | | Fix typo in form_helper.rb | Adam Jahnke | 2013-10-16 | 1 | -1/+1 | |
| |/ / / / / | ||||||
* | | | | | | @base_klass is not used | Aaron Patterson | 2013-10-21 | 1 | -1/+0 | |
| | | | | | | ||||||
* | | | | | | join_type isn't used on the node anymore | Aaron Patterson | 2013-10-21 | 2 | -11/+7 | |
| | | | | | | ||||||
* | | | | | | make joins generation method look similar | Aaron Patterson | 2013-10-21 | 1 | -6/+9 | |
| | | | | | | ||||||
* | | | | | | remove node duping code | Aaron Patterson | 2013-10-21 | 1 | -57/+19 | |
| | | | | | | ||||||
* | | | | | | refactor outer join generation | Aaron Patterson | 2013-10-21 | 1 | -11/+6 | |
| | | | | | | ||||||
* | | | | | | add outer joins for matching nodes | Aaron Patterson | 2013-10-21 | 1 | -2/+14 | |
| | | | | | | ||||||
* | | | | | | construct joins by walking the outer join tree | Aaron Patterson | 2013-10-21 | 1 | -5/+34 | |
| | | | | | | ||||||
* | | | | | | pass the outer joins to join_constraints | Aaron Patterson | 2013-10-20 | 2 | -6/+3 | |
| | | | | | | ||||||
* | | | | | | disconnect join_constraints from the instance | Aaron Patterson | 2013-10-20 | 2 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | pass in scope chain so reflection is not needed | Aaron Patterson | 2013-10-20 | 2 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | pass the foreign table and class to the join_constraints method | Aaron Patterson | 2013-10-20 | 2 | -5/+4 | |
| | | | | | | ||||||
* | | | | | | pass the join type to the join_constraints method | Aaron Patterson | 2013-10-20 | 2 | -2/+3 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-16 | 4 | -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_warning | Yves Senn | 2013-10-16 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | Rephrase ActiveRecord transaction rollback warning [ci skip] | |||||
| | * | | | | Rephrase ActiveRecord transaction rollback warning | Nate Berkopec | 2013-10-16 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | Merge pull request #12558 from lucasmazza/changelog-fixes | Rafael Mendonça França | 2013-10-16 | 2 | -12/+12 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Fix code blocks identation on AR and AS CHANGELOGs | |||||
| | * | | | | | Fix code blocks identation on AR and AS CHANGELOGs | Lucas Mazza | 2013-10-16 | 2 | -12/+12 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #12553 from tchandy/master | Guillermo Iguaran | 2013-10-15 | 1 | -95/+0 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Removing unused fake models from actionpack tests | |||||
| | * | | | | | Removing unused fake models from actionpack tests | Thiago Pradi | 2013-10-16 | 1 | -95/+0 | |
| |/ / / / / | ||||||
* | | | | | | use the node as cache so we can avoid accessing the table | Aaron Patterson | 2013-10-15 | 1 | -13/+13 | |
| | | | | | | ||||||
* | | | | | | apply tables to the whole tree from the outside | Aaron Patterson | 2013-10-15 | 1 | -14/+8 | |
| | | | | | | ||||||
* | | | | | | apply table aliases after the AST has been built | Aaron Patterson | 2013-10-15 | 1 | -1/+13 | |
| | | | | | | ||||||
* | | | | | | stop reversing tables until we absolutely must | Aaron Patterson | 2013-10-15 | 2 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | pass the chain the join_constraints | Aaron Patterson | 2013-10-15 | 2 | -3/+4 | |
| | | | | | | ||||||
* | | | | | | Merge branch 'master' into joindep | Aaron Patterson | 2013-10-15 | 6 | -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 table | Aaron Patterson | 2013-10-15 | 2 | -2/+2 | |
| | | | | | | ||||||
| * | | | | | Fix typo in the changelog entry | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] | |||||
| * | | | | | Don't remove the select values to add they back again | Rafael Mendonça França | 2013-10-15 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: activerecord/lib/active_record/relation/finder_methods.rb | |||||
| * | | | | | Merge pull request #12547 from derekprior/dp-fix-null-relation-pluck | Rafael Mendonça França | 2013-10-15 | 3 | -2/+9 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Pluck on NullRelation should accept a list of columns | |||||
| | * | | | | | Pluck on NullRelation accepts a list of columns | Derek Prior | 2013-10-15 | 3 | -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 joindep | Aaron Patterson | 2013-10-15 | 56 | -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 Dev | 2013-10-15 | 1 | -1/+1 | |
| | | | | | |