aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | Merge pull request #10090 from vipulnsward/fix_private_warnSteve Klabnik2013-04-042-3/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | fix private attribute warning
| * | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused comma after loop variable
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | minor fixes including variable name change and expanded rdoc
| * | | | | | | | | | | | | | | | | | 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 test
| * | | | | | | | | | | | | | | | | | | fix warnings in railties testVipul A M2013-04-041-3/+3
|/ / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* | | | | | | | | | | | | | | | | | | Merge pull request #10080 from vipulnsward/railties_warning_fix_v2Steve Klabnik2013-04-032-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | add require to suppress warning; remove variable
| * | | | | | | | | | | | | | | | | | 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 Typo
| * | | | | | | | | | | | | | | | | | | 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 warnings
| * | | | | | | | | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | belongs_to :touch should touch old record when transitioning.
| * | | | | | | | | | | | | | | | | 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 merge
| * | | | | | | | | | | | | | | | | | optimize some code around mergeVipul A M2013-04-031-1/+1
| | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | Merge pull request #10074 from ↵Rafael Mendonça França2013-04-036-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1
| * | | | | | | | | | | | | | | | | | | 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 bugfixes when matching multiple paths
| * | | | | | | | | | | | | | | | | | | | routing shorthand syntax works with multiple pathsYves Senn2013-03-262-5/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path.
| * | | | | | | | | | | | | | | | | | | | bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-262-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff
* | | | | | | | | | | | | | | | | | | | | 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 it
| * | | | | | | | | | | | | | | | | | | | | 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`.
| * | | | | | | | | | | | | | | | | | | | | fix regression in Mapper when `format:` was used in a `scope`.Yves Senn2013-04-032-1/+23
| | |_|_|_|_|_|/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #10071 `#normalize_path!` depends on the options so we need to call `#normalize_options!` first to make sure everything is set correctly.
* / | | | | | | | | | | | | | | | | | | | 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 message [ci skip]
| * | | | | | | | | | | | | | | | | | | Fix grammatical error on JS helper warning messagethenickcox2013-04-021-2/+2
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add changelog entry Delete changelog
* | | | | | | | | | | | | | | | | | | Merge pull request #10063 from SamSaffron/masterSantiago Pastorino2013-04-022-15/+29
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Per #9999 revert blank? to empty?
| * | | | | | | | | | | | | | | | | | | Per #9999 revert the revert changing so columns are only tested for empty? ↵Sam2013-04-032-15/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | as opposed to blank? This is both faster and more correct, added tests to make sure this is not reverted again.
* | | | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides.
* | | | | | | | | | | | | | | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since it's not a real file any longer, no need to worry about removing it when we reset the dummy.
* | | | | | | | | | | | | | | | | | | .gitkeep -> .keepSteve Klabnik2013-04-021-0/+0
| |/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mentioned in a comment in e90c2d029edc by @frodsan.
* | | | | | | | | | | | | | | | | | Merge pull request #10061 from trevorturk/dummy-key-generator-renameSantiago Pastorino2013-04-028-18/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator
| * | | | | | | | | | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-028-18/+18
| | |_|_|_|_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | Merge pull request #10060 from trevorturk/cookies-refactoringJeremy Kemper2013-04-021-28/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies refactoring
| * | | | | | | | | | | | | | | | | | :scissors: spacing after privateTrevor Turk2013-04-021-3/+0
| | | | | | | | | | | | | | | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-22 16:04:48 +0000