aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | 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
* | | | | | | | | | | Merge pull request #3782 from arunagw/warning_mode_onSantiago Pastorino2013-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Turning on warnings in "rake test" for railtiesArun Agrawal2013-04-011-1/+1
* | | | | | | | | | | | Merge pull request #9975 from mmangino/raise_when_attributes_cant_be_unserial...Aaron Patterson2013-04-022-14/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove all error masking when decoding serialized data fails?Mike Mangino2013-04-022-15/+12
| * | | | | | | | | | | | Raise an exception when unserialization fails due to a missing classMike Mangino2013-03-282-1/+10
* | | | | | | | | | | | | Merge pull request #9971 from kennyj/refactor_tasksRafael Mendonça França2013-04-0211-61/+450
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add CHANGELOG entry about extracting and deprecating Firebird/Sqlserver/Oracl...kennyj2013-04-031-0/+5
| * | | | | | | | | | | | | Show deprecated messages only when target database adapters definedYasuo Honda2013-04-033-3/+3
| * | | | | | | | | | | | | Fix tiny problem: change method order for consistency and fix wrong method name.kennyj2013-04-032-2/+2
| * | | | | | | | | | | | | Suppress deprecation messages for deprecated database tasks, when executing r...kennyj2013-04-033-0/+21
| * | | | | | | | | | | | | Add deprecation message on Firebird / Sqlserver / Oracle database tasks.kennyj2013-04-033-0/+3
| * | | | | | | | | | | | | Extract Oracle database tasks.kennyj2013-04-035-31/+140
| * | | | | | | | | | | | | Extract Sqlserver database tasks.kennyj2013-04-035-11/+131
| * | | | | | | | | | | | | Extract Firebird database tasks.kennyj2013-04-035-20/+151
* | | | | | | | | | | | | | Merge pull request #10052 from neerajdotname/stdout-in-logRafael Mendonça França2013-04-022-2/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | write sql queries to terminalNeeraj Singh2013-04-022-2/+6
* | | | | | | | | | | | | | Merge pull request #10050 from neerajdotname/no-need-of-to_s-before-internRafael Mendonça França2013-04-021-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | no need to invoke to_s before applying internNeeraj Singh2013-04-021-1/+1
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #10048 from senny/replace_merge_with_relation_calls_in_cou...Rafael Mendonça França2013-04-021-17/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | replace #merge with relation API calls in calculations_test.Yves Senn2013-04-021-17/+13
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | |