aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord
Commit message (Expand)AuthorAgeFilesLines
* 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
| | |_|/ / | |/| | |
* / | | | Improve `belongs_to touch: true` timestamp testAndrew White2013-04-051-7/+21
|/ / / /
* | | | 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-052-2/+8
* | | | 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-047-3/+26
|\ \ \ \
| * | | | has_many through obeys order on through associationNeeraj Singh2013-04-047-3/+26
* | | | | 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
| * | | | not a relation. it's an arel select managerNeeraj Singh2013-04-021-4/+4
* | | | | Remove duplicated require from AR base testCarlos Antonio da Silva2013-04-031-1/+0
* | | | | Add missing require to inheritance testCarlos Antonio da Silva2013-04-032-3/+1
* | | | | Move changelog entry to the top and fix conflict [ci skip]Carlos Antonio da Silva2013-04-031-22/+20
* | | | | Merge pull request #9141 from adamgamble/issue-9091David Heinemeier Hansson2013-04-034-0/+62
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Modifies belong_to touch callback to touch old associations also #9091Adam Gamble2013-03-143-10/+34
| * | | | + Add test for auto timestamps update of both old & new parent recordsPikachuEXE2013-03-142-0/+38
* | | | | Merge pull request #10049 from vipulnsward/optimize_around_merge_v1Rafael Mendonça França2013-04-031-1/+1
|\ \ \ \ \
| * | | | | optimize some code around mergeVipul A M2013-04-031-1/+1
* | | | | | Move alias method near to the aliased one in collection proxyCarlos Antonio da Silva2013-04-031-2/+1
* | | | | | Merge pull request #10063 from SamSaffron/masterSantiago Pastorino2013-04-022-15/+29
|\ \ \ \ \ \
| * | | | | | Per #9999 revert the revert changing so columns are only tested for empty? as...Sam2013-04-032-15/+29
| | |_|_|/ / | |/| | | |
* / | | | | true/false => truthy falsySteve Klabnik2013-04-021-2/+2
|/ / / / /
* | | / / Prefer find_by over dynamic finders in rdocSam Ruby2013-04-025-11/+11
| |_|/ / |/| | |
* | | | Merge pull request #9975 from mmangino/raise_when_attributes_cant_be_unserial...Aaron Patterson2013-04-022-14/+20
|\ \ \ \
| * | | | Remove all error masking when decoding serialized data fails?Mike Mangino2013-04-022-15/+12