aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #10106 from rmm5t/fix-explicit-name-on-multiple-fields-masterRafael Mendonça França2013-04-053-8/+24
|\
| * Fix explicit names on multiple file fieldsRyan McGeary2013-04-053-8/+24
|/
* 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
* | Fix indent and remove extra white spacesCarlos Antonio da Silva2013-04-051-15/+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
* | | Refactor mail_to to not generate intermediate hashes when adding hrefCarlos Antonio da Silva2013-04-041-5/+6
* | | Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-042-4/+10
* | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-043-5/+30
|\ \ \
| * | | Add block support for the helperSam Pohlenz2013-04-033-5/+30
* | | | Merge pull request #10092 from amco/masterCarlos Antonio da Silva2013-04-041-10/+16
|\ \ \ \
| * | | | Model generator USAGE doc improvedJason King2013-04-041-10/+16
* | | | | 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-044-5/+23
|\ \ \ \ \
| * | | | | template should have generic nameNeeraj Singh2013-04-042-2/+2
| * | | | | use | to have more intent revealing codeNeeraj Singh2013-04-041-1/+1
| * | | | | expanded rdoc for chain and reflection_namesNeeraj Singh2013-04-041-2/+20
* | | | | | Merge pull request #10095 from frodsan/exclude_template_filesCarlos Antonio da Silva2013-04-041-1/+2
|\ \ \ \ \ \
| * | | | | | Exclude template files for rdoc API [ci skip]Francesco Rodriguez2013-04-041-1/+2
|/ / / / / /
* | | | | | Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_...Rafael Mendonça França2013-04-043-33/+1
* | | | | | stop depending on callbacksAaron Patterson2013-04-041-6/+12
* | | | | | Merge pull request #10034 from benofsky/fix_skipping_object_callback_filtersRafael Mendonça França2013-04-043-1/+33
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixes skipping object callback filtersBen McRedmond2013-04-043-1/+33
* | | | | | 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 #10090 from vipulnsward/fix_private_warnSteve Klabnik2013-04-042-3/+6
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | fix private attribute warningVipul A M2013-04-042-3/+6
* | | | | | | Further simplify enumerable group_by testCarlos Antonio da Silva2013-04-041-3/+1
* | | | | | | Merge pull request #10076 from choudhuryanupam/masterRafael Mendonça França2013-04-041-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Replaced inject with mapAnupam Choudhury2013-04-041-2/+2
| * | | | | | | Removed unused comma after loop variableAnupam Choudhury2013-04-041-1/+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
| * | | | | | not a relation. it's an arel select managerNeeraj Singh2013-04-021-4/+4
* | | | | | | Merge pull request #10082 from vipulnsward/fix_railties_test-v2Steve Klabnik2013-04-031-3/+3
|\ \ \ \ \ \ \
| * | | | | | | fix warnings in railties testVipul A M2013-04-041-3/+3
|/ / / / / / /
* | | | | | | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1