aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
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-112-4/+4
* | Merge pull request #10177 from yahonda/test_relation_merging_with_merged_join...Carlos Antonio da Silva2013-04-111-1/+1
|\ \
| * | Address ORA-00979: not a GROUP BY expression errorYasuo Honda2013-04-111-1/+1
* | | cleanup statement cache testVipul A M2013-04-111-4/+4
|/ /
* | Remove warningCarlos Antonio da Silva2013-04-101-2/+2
* | Merge pull request #10152 from Noemj/statement_cacheRafael Mendonça França2013-04-104-0/+108
|\ \
| * | Added statement cacheNoemj2013-04-104-0/+108
* | | 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-102-34/+6
|/ / /
* | | While merging relations preserve context for joinsJared Armstrong and Neeraj Singh2013-04-104-4/+78
* | | Changed the ScopeRegistry and the InstrumentationRegistry to use thewangjohn2013-04-092-8/+8
* | | 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-083-6/+57
* | | Minor AR changelog improvements [ci skip]Carlos Antonio da Silva2013-04-071-4/+3
* | | 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-072-3/+3
* | | 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-062-1/+15
* | | Bring back ActiveRecord::Base#connection_handler removed by mistake on b37399abRafael Mendonça França2013-04-061-0/+4
* | | Merge branch 'railstest'Aaron Patterson2013-04-051-3/+3
|\ \ \
| * \ \ Merge branch 'master' into railstestAaron Patterson2013-04-0527-38/+216
| |\ \ \
| * | | | just check pending migrations in the current environmentAaron Patterson2013-04-051-2/+2
| * | | | check pending migrations against the test dbAaron Patterson2013-04-031-11/+3
| * | | | ensure the schema checking is done in the dev connectionAaron Patterson2013-04-031-0/+8
* | | | | Removed space and unused classAnupam Choudhury2013-04-062-2/+1
* | | | | Removed unnecessary classAnupam Choudhury2013-04-061-1/+0
| |/ / / |/| | |
* | | | Merge pull request #10098 from subwindow/postgres_dump_bigint_defaultRafael Mendonça França2013-04-054-1/+12
|\ \ \ \
| * | | | Correctly parse bigint defaults in PostgreSQLErik Peterson2013-04-054-1/+12
* | | | | Move changelog to the top [ci skip]Carlos Antonio da Silva2013-04-051-17/+17
* | | | | Merge pull request #9996 from mikz/masterJon Leighton2013-04-053-0/+34
|\ \ \ \ \
| * | | | | fix inverse_of association in block of new childMichal Cichra2013-04-013-0/+34
* | | | | | 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-054-11/+5
* | | | | | | failing test for #9869Neeraj Singh2013-04-052-0/+6
* | | | | | | Merge pull request #10102 from xxxcaqui/masterCarlos Antonio da Silva2013-04-051-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Sort modules in alphabetical order.Shunsuke Osa2013-04-051-2/+2
| | |_|/ / / / | |/| | | | |