aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'builder-instances'Rafael Mendonça França2013-10-098-59/+43
|\ \ \ \
| * | | | Method visibility will not make difference hereRafael Mendonça França2013-10-094-8/+0
| * | | | Remove builder instancesRafael Mendonça França2013-10-092-22/+10
| * | | | Extract the scope building to a class methodRafael Mendonça França2013-10-092-10/+17
| * | | | Remove unneeded readerRafael Mendonça França2013-10-091-2/+0
| * | | | Move wrap_scope to class levelRafael Mendonça França2013-10-091-2/+2
| * | | | Move macro to class levelRafael Mendonça França2013-10-094-5/+5
| * | | | Make validate_options a class methodRafael Mendonça França2013-10-091-3/+3
| * | | | Make valid_options a class methodRafael Mendonça França2013-10-096-7/+7
| * | | | Define the association extensions without need to have a builderRafael Mendonça França2013-10-093-16/+15
* | | | | Merge pull request #12488 from CoryFoy/masterRafael Mendonça França2013-10-091-6/+16
|\ \ \ \ \
| * | | | | Modifies the initialization guide to make the initializers process clearer an...Cory Foy2013-10-091-6/+16
| | |_|_|/ | |/| | |
* | | | | no need to to_symAaron Patterson2013-10-091-1/+1
* | | | | Merge branch 'tree'Aaron Patterson2013-10-095-109/+105
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | remove dead codeAaron Patterson2013-10-091-13/+0
| * | | | add some convenient methods for avoiding array allocationsAaron Patterson2013-10-092-3/+6
| * | | | hide join_constraints inside the JoinDependency objectAaron Patterson2013-10-092-8/+7
| * | | | speed up match?Aaron Patterson2013-10-091-0/+1
| * | | | expose the root node and call itAaron Patterson2013-10-091-21/+11
| * | | | just skip the join if it's already thereAaron Patterson2013-10-091-14/+10
| * | | | speed up finding existing nodesAaron Patterson2013-10-091-3/+1
| * | | | make node search more efficientAaron Patterson2013-10-094-3/+43
| * | | | remove == so we can see where walking up parents occursAaron Patterson2013-10-094-25/+15
| * | | | push parent up to the superclassAaron Patterson2013-10-093-7/+11
| * | | | convert JoinBase to a tree and remove the Node classAaron Patterson2013-10-092-42/+30
| * | | | names are guaranteed to be symbolsAaron Patterson2013-10-081-1/+1
| * | | | eliminate function that is only used in one placeAaron Patterson2013-10-081-7/+2
| * | | | we will always detect the same node, so just pass the node inAaron Patterson2013-10-081-7/+2
| * | | | we do not need to to_s the name all the timeAaron Patterson2013-10-081-5/+3
| * | | | parent is guaranteed to be the sameAaron Patterson2013-10-081-4/+1
| * | | | reduce number of comparisons and array allocationsAaron Patterson2013-10-081-11/+10
| * | | | rename the variable to make more sense with a treeAaron Patterson2013-10-081-7/+7
| * | | | walk the tree rather than generating a hash and walking itAaron Patterson2013-10-081-21/+10
| * | | | do not convert the tree to a list just for the first nodeAaron Patterson2013-10-081-1/+1
| * | | | generate the association hash from the top downAaron Patterson2013-10-081-17/+15
| * | | | store join parts in a treeAaron Patterson2013-10-081-16/+45
* | | | | Merge pull request #12485 from arunagw/code-removalRafael Mendonça França2013-10-092-35/+0
|\ \ \ \ \
| * | | | | Moved viewpathstest into actionview/test/actionpack/controllerArun Agrawal2013-10-091-0/+0
| * | | | | FakeController is not required in AVArun Agrawal2013-10-091-35/+0
|/ / / / /
* | | | | Merge pull request #12482 from francisgo/patch-11Yves Senn2013-10-091-1/+1
|\ \ \ \ \
| * | | | | [Validations Guide] Add full stop to the end of sentence [ci skip]Francis Go2013-10-101-1/+1
|/ / / / /
* | | | | Merge pull request #12481 from arunagw/fixesRafael Mendonça França2013-10-096-10/+11
|\ \ \ \ \
| * | | | | Added ActionView in rake about [ci skip]Arun Agrawal2013-10-091-5/+6
| * | | | | Minor align BR tags with HTML void - with reference to the generators code ch...AvnerCohen2013-10-092-2/+2
| * | | | | Using flat_map instead of map and flattenArun Agrawal2013-10-091-1/+1
| * | | | | Typo fix [ci skip]Arun Agrawal2013-10-091-1/+1
| * | | | | observers are not part of ActiveModel [ci skip]Arun Agrawal2013-10-091-1/+1
|/ / / / /
* | | | | Merge pull request #12283 from JuanitoFatas/rails-on-rackYves Senn2013-10-091-1/+5
|\ \ \ \ \
| * | | | | [ci skip] Add explanation on Rack::Sendfile and fix serve static files setting.Juanito Fatas2013-10-041-1/+5
* | | | | | Merge pull request #12479 from benpickles/unshift-middlewareJosé Valim2013-10-093-0/+14
|\ \ \ \ \ \