Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| * | | | | | | bugfix, when matching multiple paths with `get`, `post`, ... | Yves Senn | 2013-03-26 | 2 | -3/+21 |
* | | | | | | | Merge pull request #10070 from rubys/skip_bundle_in_railties_tests | Andrew White | 2013-04-03 | 1 | -1/+4 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Avoid running bundler on tests that don't need it | Sam Ruby | 2013-04-03 | 1 | -1/+4 |
* | | | | | | | | Merge pull request #10072 from senny/10071_format_on_scope_block_is_ignored | Andrew White | 2013-04-03 | 2 | -1/+23 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | |||||
| * | | | | | | | fix regression in Mapper when `format:` was used in a `scope`. | Yves Senn | 2013-04-03 | 2 | -1/+23 |
* | | | | | | | | Move alias method near to the aliased one in collection proxy | Carlos Antonio da Silva | 2013-04-03 | 1 | -2/+1 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #10064 from thenickcox/fix_grammatical_error | Steve Klabnik | 2013-04-02 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Fix grammatical error on JS helper warning message | thenickcox | 2013-04-02 | 1 | -2/+2 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #10063 from SamSaffron/master | Santiago Pastorino | 2013-04-02 | 2 | -15/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Per #9999 revert the revert changing so columns are only tested for empty? as... | Sam | 2013-04-03 | 2 | -15/+29 |
* | | | | | | | | true/false => truthy falsy | Steve Klabnik | 2013-04-02 | 1 | -2/+2 |
* | | | | | | | | Getting rid of a few other vestiges of rails.png. | Steve Klabnik | 2013-04-02 | 3 | -1/+0 |
|/ / / / / / / | |||||
* | | | | | | | CHANGELOG entry for rails.png removal. | Steve Klabnik | 2013-04-02 | 1 | -0/+5 |
* | | | | | | | We don't need to remove index.html any more. | Steve Klabnik | 2013-04-02 | 1 | -1/+0 |
* | | | | | | | .gitkeep -> .keep | Steve Klabnik | 2013-04-02 | 1 | -0/+0 |
| |/ / / / / |/| | | | | |