Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12488 from CoryFoy/master | Rafael Mendonça França | 2013-10-09 | 1 | -6/+16 |
|\ | | | | | [ci skip] Modifies the initialization guide to make the initializers process clearer | ||||
| * | Modifies the initialization guide to make the initializers process clearer ↵ | Cory Foy | 2013-10-09 | 1 | -6/+16 |
| | | | | | | | | and remove a TODO. [ci skip] | ||||
* | | no need to to_sym | Aaron Patterson | 2013-10-09 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'tree' | Aaron Patterson | 2013-10-09 | 5 | -109/+105 |
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * tree: (22 commits) remove dead code add some convenient methods for avoiding array allocations hide join_constraints inside the JoinDependency object speed up match? expose the root node and call it just skip the join if it's already there speed up finding existing nodes make node search more efficient remove == so we can see where walking up parents occurs push parent up to the superclass convert JoinBase to a tree and remove the Node class names are guaranteed to be symbols eliminate function that is only used in one place we will always detect the same node, so just pass the node in we do not need to to_s the name all the time parent is guaranteed to be the same reduce number of comparisons and array allocations rename the variable to make more sense with a tree walk the tree rather than generating a hash and walking it do not convert the tree to a list just for the first node ... | ||||
| * | remove dead code | Aaron Patterson | 2013-10-09 | 1 | -13/+0 |
| | | |||||
| * | add some convenient methods for avoiding array allocations | Aaron Patterson | 2013-10-09 | 2 | -3/+6 |
| | | |||||
| * | hide join_constraints inside the JoinDependency object | Aaron Patterson | 2013-10-09 | 2 | -8/+7 |
| | | |||||
| * | speed up match? | Aaron Patterson | 2013-10-09 | 1 | -0/+1 |
| | | |||||
| * | expose the root node and call it | Aaron Patterson | 2013-10-09 | 1 | -21/+11 |
| | | |||||
| * | just skip the join if it's already there | Aaron Patterson | 2013-10-09 | 1 | -14/+10 |
| | | | | | | | | Remove the annoying `find_or_build` stuff. | ||||
| * | speed up finding existing nodes | Aaron Patterson | 2013-10-09 | 1 | -3/+1 |
| | | | | | | | | | | The node must be a child of the parent passed in, so only search children of the parent node | ||||
| * | make node search more efficient | Aaron Patterson | 2013-10-09 | 4 | -3/+43 |
| | | | | | | | | | | | | Rather than search every node in the tree, comparing that node and all of its parents every time, start at the root from both sides and work our way down the tree | ||||
| * | remove == so we can see where walking up parents occurs | Aaron Patterson | 2013-10-09 | 4 | -25/+15 |
| | | |||||
| * | push parent up to the superclass | Aaron Patterson | 2013-10-09 | 3 | -7/+11 |
| | | | | | | | | We always want a linked list back to the root node. | ||||
| * | convert JoinBase to a tree and remove the Node class | Aaron Patterson | 2013-10-09 | 2 | -42/+30 |
| | | |||||
| * | names are guaranteed to be symbols | Aaron Patterson | 2013-10-08 | 1 | -1/+1 |
| | | |||||
| * | eliminate function that is only used in one place | Aaron Patterson | 2013-10-08 | 1 | -7/+2 |
| | | |||||
| * | we will always detect the same node, so just pass the node in | Aaron Patterson | 2013-10-08 | 1 | -7/+2 |
| | | |||||
| * | we do not need to to_s the name all the time | Aaron Patterson | 2013-10-08 | 1 | -5/+3 |
| | | |||||
| * | parent is guaranteed to be the same | Aaron Patterson | 2013-10-08 | 1 | -4/+1 |
| | | | | | | | | | | since we are searching a tree, the current level should be consistent, so we don't have to inspect the parent class / table | ||||
| * | reduce number of comparisons and array allocations | Aaron Patterson | 2013-10-08 | 1 | -11/+10 |
| | | | | | | | | | | Just inspecting the children nodes will reduce the number of comparisons we have to do (since it is limited to the child size) | ||||
| * | rename the variable to make more sense with a tree | Aaron Patterson | 2013-10-08 | 1 | -7/+7 |
| | | |||||
| * | walk the tree rather than generating a hash and walking it | Aaron Patterson | 2013-10-08 | 1 | -21/+10 |
| | | |||||
| * | do not convert the tree to a list just for the first node | Aaron Patterson | 2013-10-08 | 1 | -1/+1 |
| | | |||||
| * | generate the association hash from the top down | Aaron Patterson | 2013-10-08 | 1 | -17/+15 |
| | | | | | | | | | | This prevents us from walking back up the parent tree once for each leaf. | ||||
| * | store join parts in a tree | Aaron Patterson | 2013-10-08 | 1 | -16/+45 |
| | | |||||
* | | Merge pull request #12485 from arunagw/code-removal | Rafael Mendonça França | 2013-10-09 | 2 | -35/+0 |
|\ \ | | | | | | | viewpathtests file moved | ||||
| * | | Moved viewpathstest into actionview/test/actionpack/controller | Arun Agrawal | 2013-10-09 | 1 | -0/+0 |
| | | | | | | | | | | | | These test were not running at all, Now it will run as a tests part. | ||||
| * | | FakeController is not required in AV | Arun Agrawal | 2013-10-09 | 1 | -35/+0 |
|/ / | |||||
* | | Merge pull request #12482 from francisgo/patch-11 | Yves Senn | 2013-10-09 | 1 | -1/+1 |
|\ \ | | | | | | | [Validations Guide] Add full stop to the end of sentence [ci skip] | ||||
| * | | [Validations Guide] Add full stop to the end of sentence [ci skip] | Francis Go | 2013-10-10 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #12481 from arunagw/fixes | Rafael Mendonça França | 2013-10-09 | 6 | -10/+11 |
|\ \ | | | | | | | Few fixes which includes revert fixes | ||||
| * | | Added ActionView in rake about [ci skip] | Arun Agrawal | 2013-10-09 | 1 | -5/+6 |
| | | | |||||
| * | | Minor align BR tags with HTML void - with reference to the generators code ↵ | AvnerCohen | 2013-10-09 | 2 | -2/+2 |
| | | | | | | | | | | | | change - https://github.com/rails/rails/commit/f038d4cc5fe1ac21f92c7e32c61ff85a0c816f3f | ||||
| * | | Using flat_map instead of map and flatten | Arun Agrawal | 2013-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | original commit 8998441967a8cfc6e4302c29664ab9d0acd77704 Reverted here ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 | ||||
| * | | Typo fix [ci skip] | Arun Agrawal | 2013-10-09 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing the typo which is formed a not required link. Check here http://api.rubyonrails.org/classes/ActionController/Base.html under paramters section keeping it under tt tag gets reverted here ec8ef1e1055c4e1598da13f49d30261f07f4a9b4 | ||||
| * | | observers are not part of ActiveModel [ci skip] | Arun Agrawal | 2013-10-09 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #12283 from JuanitoFatas/rails-on-rack | Yves Senn | 2013-10-09 | 1 | -1/+5 |
|\ \ | | | | | | | [ci skip] Add explanation on Rack::Sendfile middleware in rails_on_rack.md. | ||||
| * | | [ci skip] Add explanation on Rack::Sendfile and fix serve static files setting. | Juanito Fatas | 2013-10-04 | 1 | -1/+5 |
| | | | |||||
* | | | Merge pull request #12479 from benpickles/unshift-middleware | José Valim | 2013-10-09 | 3 | -0/+14 |
|\ \ \ | | | | | | | | | Expose MiddlewareStack#unshift to environment configuration | ||||
| * | | | Expose MiddlewareStack#unshift to environment configuration. | Ben Pickles | 2013-10-09 | 3 | -0/+14 |
| | | | | |||||
* | | | | add dots after `Fixes #YYYYY` in actionpack CHANGELOG. [ci skip] | Yves Senn | 2013-10-09 | 1 | -12/+12 |
| | | | | |||||
* | | | | Merge pull request #12083 from BlueHotDog/fixing_respond_with | Yves Senn | 2013-10-09 | 4 | -0/+25 |
|\ \ \ \ | | | | | | | | | | | Fixing repond_with working directly on the options hash | ||||
| * | | | | Fixing repond_with working directly on the options hash | BlueHotDog | 2013-10-09 | 4 | -0/+25 |
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes an issue where the respond_with worked directly with the given options hash, so that if a user relied on it after calling respond_with, the hash wouldn't be the same. Fixes #12029 | ||||
* | | | | Merge pull request #12473 from claudiob/document-after-touch | Yves Senn | 2013-10-09 | 2 | -2/+6 |
|\ \ \ \ | |/ / / |/| | | | Add documentation for after_touch [ci skip] | ||||
| * | | | Add documentation for after_touch [ci skip] | claudiob | 2013-10-08 | 2 | -2/+6 |
| | |/ | |/| | |||||
* | | | :scissors: | Rafael Mendonça França | 2013-10-09 | 2 | -2/+2 |
| | | | |||||
* | | | Push define_accessors to class level since we don't need anythig from | Rafael Mendonça França | 2013-10-08 | 3 | -8/+8 |
| | | | | | | | | | | | | the instance | ||||
* | | | Use the reflection name instead of the accessor | Rafael Mendonça França | 2013-10-08 | 2 | -1/+2 |
| | | | |||||
* | | | Move add_counter_cache_methods to class level | Rafael Mendonça França | 2013-10-08 | 1 | -2/+2 |
| | | |