aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* `Relation#count` doesn't use options anymore.Vipul A M2013-10-133-8/+5
* Merge pull request #11791 from versioncontrol/includes_with_persistent_selectRafael Mendonça França2013-10-123-1/+15
|\
| * Fixes #11773 when using includes combined with select, the select statement w...Edo Balvers2013-10-083-1/+15
* | Merge pull request #12507 from malavbhavsar/doc_patchRafael Mendonça França2013-10-122-2/+2
|\ \
| * | Some fixes in docs [ci skip]Malav Bhavsar2013-10-112-2/+2
* | | Merge pull request #12512 from sbagdat/patch-1Andrew White2013-10-121-1/+1
|\ \ \
| * | | Fix a writing mistakeSıtkı Bağdat2013-10-121-1/+1
|/ / /
* | | Revert "Merge pull request #12480 from iwiznia/master"Jeremy Kemper2013-10-114-57/+0
* | | no reason to do this column addition and subtraction businessAaron Patterson2013-10-111-1/+1
* | | Merge pull request #12480 from iwiznia/masterRafael Mendonça França2013-10-114-0/+57
|\ \ \
| * | | flatten and flatten! methods for ActiveSupport::DurationIonatan Wiznia2013-10-114-0/+57
| |/ /
* | | Merge pull request #12503 from arunagw/removed-unused-requireRafael Mendonça França2013-10-111-1/+0
|\ \ \
| * | | No need to require rbconfig as we are using Gem.rubyArun Agrawal2013-10-111-1/+0
|/ / /
* | | refactor a little so we can remove some methodsAaron Patterson2013-10-102-4/+1
* | | the parent node is on the stack, so use itAaron Patterson2013-10-101-4/+4
* | | pass the parent node to the construct methodAaron Patterson2013-10-101-7/+6
* | | nodes do not need to be sortedAaron Patterson2013-10-101-1/+1
* | | delete unused codeAaron Patterson2013-10-102-50/+0
* | | merge JoinDependency as outer joinsAaron Patterson2013-10-102-1/+31
* | | stuff the join dependency object in the "anything goes" hash.Aaron Patterson2013-10-104-6/+8
* | | stop splatting things back and forthAaron Patterson2013-10-102-2/+2
* | | simplify each method.Aaron Patterson2013-10-101-8/+2
* | | Merge pull request #12339 from tjschuck/bcrypt_cost_attrJeremy Kemper2013-10-103-1/+13
|\ \ \
| * | | Use bcrypt's public cost attr, not internal constantT.J. Schuck2013-10-103-1/+13
|/ / /
* / / Respect `SCRIPT_NAME` when using `redirect` with a relative pathAndrew White2013-10-103-0/+136
|/ /
* | stop creating a bunch of relation objects when we can slap all the joins on a...Aaron Patterson2013-10-092-8/+3
* | 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