Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Ensure mail_to helper does not modify the given html options hash | Carlos Antonio da Silva | 2013-04-04 | 2 | -4/+10 | |
* | | | | | Merge pull request #10065 from spohlenz/mail_to_block | Carlos Antonio da Silva | 2013-04-04 | 3 | -5/+30 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add block support for the helper | Sam Pohlenz | 2013-04-03 | 3 | -5/+30 | |
* | | | | | | Merge pull request #10092 from amco/master | Carlos Antonio da Silva | 2013-04-04 | 1 | -10/+16 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Model generator USAGE doc improved | Jason King | 2013-04-04 | 1 | -10/+16 | |
* | | | | | | | Use inspect when writing the foreign key from the reflection | Andrew White | 2013-04-05 | 2 | -2/+8 | |
* | | | | | | | Use a space after the comment sign when showing the result of commands | Carlos Antonio da Silva | 2013-04-04 | 1 | -4/+4 | |
* | | | | | | | Merge pull request #10094 from neerajdotname/fix2 | Carlos Antonio da Silva | 2013-04-04 | 4 | -5/+23 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | template should have generic name | Neeraj Singh | 2013-04-04 | 2 | -2/+2 | |
| * | | | | | | | use | to have more intent revealing code | Neeraj Singh | 2013-04-04 | 1 | -1/+1 | |
| * | | | | | | | expanded rdoc for chain and reflection_names | Neeraj Singh | 2013-04-04 | 1 | -2/+20 | |
* | | | | | | | | Merge pull request #10095 from frodsan/exclude_template_files | Carlos Antonio da Silva | 2013-04-04 | 1 | -1/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Exclude template files for rdoc API [ci skip] | Francesco Rodriguez | 2013-04-04 | 1 | -1/+2 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Revert "Merge pull request #10034 from benofsky/fix_skipping_object_callback_... | Rafael Mendonça França | 2013-04-04 | 3 | -33/+1 | |
* | | | | | | | | stop depending on callbacks | Aaron Patterson | 2013-04-04 | 1 | -6/+12 | |
* | | | | | | | | Merge pull request #10034 from benofsky/fix_skipping_object_callback_filters | Rafael Mendonça França | 2013-04-04 | 3 | -1/+33 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Fixes skipping object callback filters | Ben McRedmond | 2013-04-04 | 3 | -1/+33 | |
* | | | | | | | | Merge pull request #10087 from neerajdotname/10016 | Carlos Antonio da Silva | 2013-04-04 | 7 | -3/+26 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | has_many through obeys order on through association | Neeraj Singh | 2013-04-04 | 7 | -3/+26 | |
* | | | | | | | | | Merge pull request #10090 from vipulnsward/fix_private_warn | Steve Klabnik | 2013-04-04 | 2 | -3/+6 | |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | fix private attribute warning | Vipul A M | 2013-04-04 | 2 | -3/+6 | |
* | | | | | | | | | Further simplify enumerable group_by test | Carlos Antonio da Silva | 2013-04-04 | 1 | -3/+1 | |
* | | | | | | | | | Merge pull request #10076 from choudhuryanupam/master | Rafael Mendonça França | 2013-04-04 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Replaced inject with map | Anupam Choudhury | 2013-04-04 | 1 | -2/+2 | |
| * | | | | | | | | | Removed unused comma after loop variable | Anupam Choudhury | 2013-04-04 | 1 | -1/+1 | |
| |/ / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #10088 from neerajdotname/fixes1 | Rafael Mendonça França | 2013-04-04 | 3 | -5/+15 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | expanded rdoc on source_reflection method | Neeraj Singh | 2013-04-04 | 1 | -0/+10 | |
| * | | | | | | | | show name of the klass that has missing association | Neeraj Singh | 2013-04-02 | 1 | -1/+1 | |
| * | | | | | | | | not a relation. it's an arel select manager | Neeraj Singh | 2013-04-02 | 1 | -4/+4 | |
* | | | | | | | | | Merge pull request #10082 from vipulnsward/fix_railties_test-v2 | Steve Klabnik | 2013-04-03 | 1 | -3/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | fix warnings in railties test | Vipul A M | 2013-04-04 | 1 | -3/+3 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Fix typo in view name | Carlos Antonio da Silva | 2013-04-03 | 2 | -1/+1 | |
* | | | | | | | | | Merge pull request #10080 from vipulnsward/railties_warning_fix_v2 | Steve Klabnik | 2013-04-03 | 2 | -1/+2 | |
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | add require to suppress warning; remove variable | Vipul A M | 2013-04-04 | 2 | -1/+2 | |
* | | | | | | | | | Remove duplicated require from AR base test | Carlos Antonio da Silva | 2013-04-03 | 1 | -1/+0 | |
* | | | | | | | | | Merge pull request #10079 from prathamesh-sonpatki/typo | Carlos Antonio da Silva | 2013-04-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fixed Typo | Prathamesh Sonpatki | 2013-04-04 | 1 | -1/+1 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #10078 from vipulnsward/railties_warning_fix_v1 | Carlos Antonio da Silva | 2013-04-03 | 2 | -4/+3 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Fix some railties test warnings | Vipul A M | 2013-04-03 | 2 | -4/+3 | |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | ||||||
* | | | | | | | | | Add missing require to inheritance test | Carlos Antonio da Silva | 2013-04-03 | 2 | -3/+1 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Move changelog entry to the top and fix conflict [ci skip] | Carlos Antonio da Silva | 2013-04-03 | 1 | -22/+20 | |
* | | | | | | | | Merge pull request #9141 from adamgamble/issue-9091 | David Heinemeier Hansson | 2013-04-03 | 4 | -0/+62 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Modifies belong_to touch callback to touch old associations also #9091 | Adam Gamble | 2013-03-14 | 3 | -10/+34 | |
| * | | | | | | | + Add test for auto timestamps update of both old & new parent records | PikachuEXE | 2013-03-14 | 2 | -0/+38 | |
* | | | | | | | | Merge pull request #10049 from vipulnsward/optimize_around_merge_v1 | Rafael Mendonça França | 2013-04-03 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | optimize some code around merge | Vipul A M | 2013-04-03 | 1 | -1/+1 | |
* | | | | | | | | | Merge pull request #10074 from trevorturk/remove-fixme-comments-about-legacy-... | Rafael Mendonça França | 2013-04-03 | 6 | -6/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove comments about removing LegacyKeyGenerator in 4.1 | Trevor Turk | 2013-04-03 | 6 | -6/+0 | |
* | | | | | | | | | | Merge pull request #9932 from senny/9913_routing_problem | Andrew White | 2013-04-03 | 2 | -8/+41 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | routing shorthand syntax works with multiple paths | Yves Senn | 2013-03-26 | 2 | -5/+20 |