aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | 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
* | | | | | | | | Merge pull request #10080 from vipulnsward/railties_warning_fix_v2Steve Klabnik2013-04-032-1/+2
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | add require to suppress warning; remove variableVipul A M2013-04-042-1/+2
* | | | | | | | | Remove duplicated require from AR base testCarlos Antonio da Silva2013-04-031-1/+0
* | | | | | | | | Merge pull request #10079 from prathamesh-sonpatki/typoCarlos Antonio da Silva2013-04-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixed TypoPrathamesh Sonpatki2013-04-041-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10078 from vipulnsward/railties_warning_fix_v1Carlos Antonio da Silva2013-04-032-4/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix some railties test warningsVipul A M2013-04-032-4/+3
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | 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
* | | | | | | | | Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-...Rafael Mendonça França2013-04-036-6/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove comments about removing LegacyKeyGenerator in 4.1Trevor Turk2013-04-036-6/+0
* | | | | | | | | | Merge pull request #9932 from senny/9913_routing_problemAndrew White2013-04-032-8/+41
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | routing shorthand syntax works with multiple pathsYves Senn2013-03-262-5/+20