| Commit message (Expand) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | | | | | 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 | |
| | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | | Merge pull request #10061 from trevorturk/dummy-key-generator-rename | Santiago Pastorino | 2013-04-02 | 8 | -18/+18 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator | Trevor Turk | 2013-04-02 | 8 | -18/+18 | |
| | | |_|_|_|_|/ / | |/| | | | | | | ||||||
| * | | | | | | | | Merge pull request #10060 from trevorturk/cookies-refactoring | Jeremy Kemper | 2013-04-02 | 1 | -28/+25 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | :scissors: spacing after private | Trevor Turk | 2013-04-02 | 1 | -3/+0 | |
| | * | | | | | | | | Be consistent when talking about cookies, key -> name | Trevor Turk | 2013-04-02 | 1 | -25/+25 | |
| * | | | | | | | | | Merge pull request #10059 from trevorturk/perm-cookie-jar-fix | Steve Klabnik | 2013-04-02 | 2 | -2/+7 | |
| |\| | | | | | | | | |/ / / / / / / |/| | | | | | | | ||||||
| | * | | | | | | | Fix permanent cookie jar accessor typo | Trevor Turk | 2013-04-02 | 2 | -2/+7 | |
| |/ / / / / / / | ||||||
| * | | | | | | | Fix tests from rails.png removal. | Jessica Lynn Suttles | 2013-04-02 | 1 | -1/+8 | |
| * | | | | | | | Merge pull request #10056 from steveklabnik/remove_rails_png | David Heinemeier Hansson | 2013-04-02 | 3 | -1/+1 | |
| |\ \ \ \ \ \ \ | ||||||
| | * | | | | | | | adding .gigkeep to default app/assets/images | Steve Klabnik | 2013-04-02 | 1 | -0/+0 | |
| | * | | | | | | | Remove rails.png. | Steve Klabnik | 2013-04-02 | 2 | -1/+1 | |
| * | | | | | | | | Merge pull request #10054 from rubys/use_find_by_in_rdoc | Santiago Pastorino | 2013-04-02 | 10 | -23/+23 | |
| |\ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | Prefer find_by over dynamic finders in rdoc | Sam Ruby | 2013-04-02 | 10 | -23/+23 | |
| | |/ / / / / / / | ||||||
| * | | | | | | | | Merge pull request #10055 from vipulnsward/remove_each_with_index_in_test | Santiago Pastorino | 2013-04-02 | 1 | -1/+1 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
 |
index : rails.git | |
| Mirror of official rails repo with custom fixes. | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |