aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| * | | | | | | | | bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-262-3/+21
* | | | | | | | | | Merge pull request #10070 from rubys/skip_bundle_in_railties_testsAndrew White2013-04-031-1/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoid running bundler on tests that don't need itSam Ruby2013-04-031-1/+4
* | | | | | | | | | | Merge pull request #10072 from senny/10071_format_on_scope_block_is_ignoredAndrew White2013-04-032-1/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | fix regression in Mapper when `format:` was used in a `scope`.Yves Senn2013-04-032-1/+23
| | |_|_|_|_|_|/ / / | |/| | | | | | | |
* / | | | | | | | | Move alias method near to the aliased one in collection proxyCarlos Antonio da Silva2013-04-031-2/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10064 from thenickcox/fix_grammatical_errorSteve Klabnik2013-04-021-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix grammatical error on JS helper warning messagethenickcox2013-04-021-2/+2
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10063 from SamSaffron/masterSantiago Pastorino2013-04-022-15/+29
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Per #9999 revert the revert changing so columns are only tested for empty? as...Sam2013-04-032-15/+29
* | | | | | | | | | true/false => truthy falsySteve Klabnik2013-04-021-2/+2
* | | | | | | | | | Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-023-1/+0
|/ / / / / / / / /
* | | | | | | | | CHANGELOG entry for rails.png removal.Steve Klabnik2013-04-021-0/+5
* | | | | | | | | We don't need to remove index.html any more.Steve Klabnik2013-04-021-1/+0
* | | | | | | | | .gitkeep -> .keepSteve Klabnik2013-04-021-0/+0
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #10061 from trevorturk/dummy-key-generator-renameSantiago Pastorino2013-04-028-18/+18
|\ \ \ \ \ \ \ \
| * | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-028-18/+18
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #10060 from trevorturk/cookies-refactoringJeremy Kemper2013-04-021-28/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | :scissors: spacing after privateTrevor Turk2013-04-021-3/+0
| * | | | | | | | Be consistent when talking about cookies, key -> nameTrevor Turk2013-04-021-25/+25
* | | | | | | | | Merge pull request #10059 from trevorturk/perm-cookie-jar-fixSteve Klabnik2013-04-022-2/+7
|\| | | | | | | | | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix permanent cookie jar accessor typoTrevor Turk2013-04-022-2/+7
|/ / / / / / /
* | | | | | | Fix tests from rails.png removal.Jessica Lynn Suttles2013-04-021-1/+8
* | | | | | | Merge pull request #10056 from steveklabnik/remove_rails_pngDavid Heinemeier Hansson2013-04-023-1/+1
|\ \ \ \ \ \ \
| * | | | | | | adding .gigkeep to default app/assets/imagesSteve Klabnik2013-04-021-0/+0
| * | | | | | | Remove rails.png.Steve Klabnik2013-04-022-1/+1
* | | | | | | | Merge pull request #10054 from rubys/use_find_by_in_rdocSantiago Pastorino2013-04-0210-23/+23
|\ \ \ \ \ \ \ \
| * | | | | | | | Prefer find_by over dynamic finders in rdocSam Ruby2013-04-0210-23/+23
| |/ / / / / / /
* | | | | | | | Merge pull request #10055 from vipulnsward/remove_each_with_index_in_testSantiago Pastorino2013-04-021-1/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | each_with_index => each as we dont use indexVipul A M2013-04-031-1/+1
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #10053 from wangjohn/change_docs_for_associations_distinct...Steve Klabnik2013-04-021-6/+30
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Changed the guides to use distinct instead of uniq for associations (seewangjohn2013-04-021-6/+30
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-12 23:12:59 +0000