aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #9507 from senny/9483_migrations_without_transactionsRafael Mendonça França2013-03-065-12/+97
|\
| * transactions can be turned off per Migration.Yves Senn2013-03-055-9/+90
| * transactional migration test-case was broken.Yves Senn2013-03-051-3/+7
* | Merge pull request #9585 from RKushnir/patch-1Carlos Antonio da Silva2013-03-061-1/+1
|\ \
| * | Typo in comment to ActionView::Resolver#find_allRKushnir2013-03-061-1/+1
|/ /
* | Merge pull request #9581 from senny/9559_changelog_singularizing_singularXavier Noria2013-03-061-1/+14
|\ \
| * | CHANGELOG entry for improved singularizing of singulars.Yves Senn2013-03-061-1/+14
|/ /
* | Add missing require to debug helper testCarlos Antonio da Silva2013-03-051-2/+2
* | Merge pull request #9574 from robertomiranda/debug_helper_testRafael Mendonça França2013-03-051-0/+8
|\ \
| * | Add DebugHelperTestrobertomiranda2013-03-051-0/+8
|/ /
* | Merge pull request #9565 from kennyj/remove_unused_return_valueXavier Noria2013-03-053-5/+4
|\ \
| * | Remove unused return value, because collecting_queries_for_explain isn't publ...kennyj2013-03-063-5/+4
* | | Merge pull request #9573 from robertomiranda/useless_gsubGuillermo Iguaran2013-03-051-1/+1
|\ \ \
| * | | Use gsub intead of tr when the to_str is longer than the from_strrobertomiranda2013-03-051-1/+1
|/ / /
* | | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2013-03-058-11/+9
|\ \ \ | |/ / |/| |
| * | Fix typoCarson McDonald2013-03-051-1/+1
| * | Remove reference to BugMash. Link hasn't been updated in 4 years.Jonathan Roes2013-03-051-2/+0
| * | Fix WhereChain docs to mention only notErnie Miller2013-03-041-1/+1
| * | Small TypoLebin Sebastian F2013-03-041-1/+1
| * | Add explanation of :dependent => :restrictDavid Deller2013-03-011-1/+1
| * | Reverting commit regarding public/index.html (no longer in Rails 4.)Christine Hertzel2013-03-011-2/+0
| * | Fixed grammatical error and simplified paragraph concerning controllers.Christine Hertzel2013-03-011-1/+1
| * | Clarified removal of public/index.html fileChelsea Macaluso2013-03-011-0/+2
| * | Clarified need to remove existing code in welcome index.Trent Michaels2013-03-011-1/+1
| * | fix broken links to README docs in introMike Munroe2013-02-281-2/+2
| * | change log4r link to most recent, updated locationMike Munroe2013-02-281-1/+1
* | | Merge pull request #9564 from robertomiranda/useless_gsubGuillermo Iguaran2013-03-054-5/+5
|\ \ \ | |_|/ |/| |
| * | change useless gsub to trrobertomiranda2013-03-054-5/+5
|/ /
* | Merge pull request #9042 from senny/9034_float_0_0_is_always_dirtyCarlos Antonio da Silva2013-03-053-1/+32
|\ \
| * | assigning '0.0' to a nullable numeric column does not make it dirtyYves Senn2013-03-053-1/+32
* | | Merge pull request #9561 from inossidabile/explicit_match_via_requirement_exc...Carlos Antonio da Silva2013-03-051-1/+2
|\ \ \ | |/ / |/| |
| * | Routing match `via` option requirement exception message made more explicitBoris Staal2013-03-051-1/+2
* | | Merge pull request #9557 from bonsaiben/useless_gsubCarlos Antonio da Silva2013-03-051-1/+1
|\ \ \
| * | | change useless gsub to deleteBenjamin Sullivan2013-03-051-1/+1
* | | | Fix typo in AC overview guide [ci skip]Carlos Antonio da Silva2013-03-051-1/+1
| |/ / |/| |
* | | Merge pull request #9556 from senny/strong_params_examplesXavier Noria2013-03-051-0/+21
|\ \ \ | |/ / |/| |
| * | example for `accepts_nested_attribtues_for` and strong parameters.Yves Senn2013-03-051-0/+9
| * | strong parameters example for default values using `fetch`. [ci skip]Yves Senn2013-03-051-0/+12
|/ /
* | Merge pull request #9554 from tmm1/string-gsub-hashJosé Valim2013-03-041-2/+2
|\ \
| * | Call String#gsub with Hash directlyAman Gupta2013-03-041-2/+2
|/ /
* | adds guides/.document to tell rdoc not to process this directoryXavier Noria2013-03-041-0/+0
* | Merge pull request #9467 from senny/9459_include_json_root_out_of_syncRafael Mendonça França2013-03-043-34/+60
|\ \
| * | `ActiveRecord::Base.include_root_in_json` is `false` by default.Yves Senn2013-03-042-1/+5
| * | rewrite tests to have no side-effects on `include_root_in_json`.Yves Senn2013-03-041-33/+55
|/ /
* | only calculate next_id when we need a new method definedAaron Patterson2013-03-041-1/+2
* | Merge pull request #9541 from maximerety/fix_7774José Valim2013-03-042-1/+6
|\ \
| * | Fix formats on xhr requests when HTTP_ACCEPT is empty stringmaximerety2013-03-042-1/+6
* | | Merge pull request #9540 from dimko/patch-1Xavier Noria2013-03-041-3/+3
|\ \ \ | |/ / |/| |
| * | Fixed typo in active record's changelogDimko2013-03-041-3/+3
|/ /
* | Remove .all usage from unscope doc examples [ci skip]Carlos Antonio da Silva2013-03-041-4/+4