aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-04-117-8/+19
|\
| * JoinPart is no longer an abstract classNeeraj Singh2013-04-081-1/+1
| * update ActiveRecord::AttributeMethods::Serialization documentation [ci skip]Francesco Rodriguez2013-04-041-0/+7
| * mark ReversibleBlockHelper as :nodoc: [ci skip]Francesco Rodriguez2013-04-041-1/+1
| * mark relation mutator as :nodoc: [ci skip]Francesco Rodriguez2013-04-021-2/+1
| * minor copy editingNeeraj Singh2013-03-303-4/+9
* | Switched to new naming conventionsNoemj2013-04-111-1/+1
* | Remove warningCarlos Antonio da Silva2013-04-101-2/+2
* | Merge pull request #10152 from Noemj/statement_cacheRafael Mendonça França2013-04-102-0/+27
|\ \
| * | Added statement cacheNoemj2013-04-102-0/+27
* | | Merge pull request #10168 from neerajdotname/simple_improvementsRafael Mendonça França2013-04-103-5/+39
|\ \ \
| * | | converge three lines into oneNeeraj Singh2013-04-101-3/+1
| * | | rdoc for some of the methods in JoinDependencyNeeraj Singh2013-04-102-0/+36
| * | | remove_duplicate_results! should be protectedNeeraj Singh2013-04-101-2/+2
* | | | Revert "Merge pull request #6226 from gnufied/master"Rafael Mendonça França2013-04-101-2/+6
|/ / /
* | | While merging relations preserve context for joinsJared Armstrong and Neeraj Singh2013-04-102-3/+36
* | | Changed the ScopeRegistry and the InstrumentationRegistry to use thewangjohn2013-04-091-6/+6
* | | Created a runtime registry for thread local variables in active record.wangjohn2013-04-095-6/+39
* | | Merge pull request #10142 from wangjohn/grouping_thread_localsRafael Mendonça França2013-04-092-9/+16
|\ \ \
| * | | Delegating the value getter and setters in the ScopeRegistry to thewangjohn2013-04-082-9/+16
* | | | changed variable name active_record => base_klassNeeraj Singh2013-04-094-12/+12
* | | | fix AP warning; remove unused variableVipul A M2013-04-091-1/+1
|/ / /
* | | Grouping thread locals in the ActiveRecord scopes so that thewangjohn2013-04-082-4/+55
* | | Avoid iterating over records hash when not necessaryCarlos Antonio da Silva2013-04-071-2/+6
* | | each to each_value; remove unused varsVipul A M2013-04-071-1/+1
* | | Added a bang to the end of +raise_nested_attributes_record_not_found+wangjohn2013-04-061-3/+3
* | | Deprecate ActiveRecord#Base.default_scopes?Agis-2013-04-061-1/+10
* | | Bring back ActiveRecord::Base#connection_handler removed by mistake on b37399abRafael Mendonça França2013-04-061-0/+4
* | | Merge branch 'master' into railstestAaron Patterson2013-04-0513-31/+71
|\ \ \
| * \ \ Merge pull request #10098 from subwindow/postgres_dump_bigint_defaultRafael Mendonça França2013-04-051-1/+1
| |\ \ \
| | * | | Correctly parse bigint defaults in PostgreSQLErik Peterson2013-04-051-1/+1
| * | | | Merge pull request #9996 from mikz/masterJon Leighton2013-04-051-0/+1
| |\ \ \ \
| | * | | | fix inverse_of association in block of new childMichal Cichra2013-04-011-0/+1
| * | | | | Merge pull request #10058 from jamesgolick/masterJon Leighton2013-04-052-5/+3
| |\ \ \ \ \
| | * | | | | Refactor CollectionProxy#scope to avoid calling #extend.James Golick2013-04-022-5/+3
| * | | | | | Fix scope chaining + STIJon Leighton2013-04-052-9/+4
| * | | | | | Sort modules in alphabetical order.Shunsuke Osa2013-04-051-2/+2
| | |_|/ / / | |/| | | |
| * | | | | Avoid an attempt to fetch old record when id was not present in touch callbackCarlos Antonio da Silva2013-04-041-7/+7
| * | | | | Use the correct pk field from the reflected class to find the old recordCarlos Antonio da Silva2013-04-041-1/+2
| * | | | | Use inspect when writing the foreign key from the reflectionAndrew White2013-04-051-2/+2
| * | | | | Use a space after the comment sign when showing the result of commandsCarlos Antonio da Silva2013-04-041-4/+4
| * | | | | Merge pull request #10094 from neerajdotname/fix2Carlos Antonio da Silva2013-04-042-3/+21
| |\ \ \ \ \
| | * | | | | use | to have more intent revealing codeNeeraj Singh2013-04-041-1/+1
| | * | | | | expanded rdoc for chain and reflection_namesNeeraj Singh2013-04-041-2/+20
| * | | | | | stop depending on callbacksAaron Patterson2013-04-041-6/+12
| |/ / / / /
| * | | | | Merge pull request #10087 from neerajdotname/10016Carlos Antonio da Silva2013-04-041-0/+1
| |\ \ \ \ \
| | * | | | | has_many through obeys order on through associationNeeraj Singh2013-04-041-0/+1
| * | | | | | Merge pull request #10088 from neerajdotname/fixes1Rafael Mendonça França2013-04-043-5/+15
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | expanded rdoc on source_reflection methodNeeraj Singh2013-04-041-0/+10
| | * | | | | show name of the klass that has missing associationNeeraj Singh2013-04-021-1/+1