aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of github.com:lifo/docrailsSergey Parizhskiy2011-12-051-1/+1
|\
| * Remove redundant orJason Noble2011-12-051-1/+1
| |
* | changes in the way of how the stylesheets_link_tag worksSergey Parizhskiy2011-12-051-5/+9
|/
* Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-042-158/+422
|\
| * copy edits in the migrations guideVijay Dev2011-12-041-48/+46
| |
| * Be explicit about where to add/remove stuff to the migrationJason Noble2011-12-031-1/+2
| |
| * Fix missing /ruby blockJason Noble2011-12-031-0/+1
| |
| * Be explicit of where the constraints are.Jason Noble2011-12-031-1/+1
| |
| * Improve readabilityJason Noble2011-12-031-4/+5
| |
| * Be more friendly than "shut up"Jason Noble2011-12-031-1/+1
| |
| * A table format makes this section easier to readJason Noble2011-12-031-7/+11
| |
| * This section is more about changing the output of running migrationsJason Noble2011-12-031-1/+1
| |
| * Improve readabilityJason Noble2011-12-031-2/+2
| |
| * Readability improvementsJason Noble2011-12-031-1/+1
| |
| * Move this into a section so that "Resetting the database" will show up in TOCJason Noble2011-12-031-1/+3
| |
| * Change wording to be more explicit on what migrating with a version doesJason Noble2011-12-031-2/+3
| |
| * Migrations can also run the "change" methodJason Noble2011-12-031-3/+3
| |
| * Reword section to make it more readable.Jason Noble2011-12-031-4/+7
| |
| * We're using methods, not writing themJason Noble2011-12-031-1/+1
| |
| * Change wording to be more understandableJason Noble2011-12-031-2/+2
| |
| * We're using the method, not writing itJason Noble2011-12-031-1/+1
| |
| * Change The other... to Another...Jason Noble2011-12-031-1/+1
| |
| * Reword confusing sectionJason Noble2011-12-031-4/+2
| |
| * Correct grammatical errorsJason Noble2011-12-031-2/+2
| |
| * It's more that Rails needs to know how to recreate the columnsJason Noble2011-12-031-1/+1
| |
| * Added "also" to read betterJason Noble2011-12-031-1/+1
| |
| * Explain the t.timestamps method a little betterJason Noble2011-12-031-3/+4
| |
| * Re-word confusing sectionJason Noble2011-12-031-4/+3
| |
| * Rollback is used elsewhere in the tutorialJason Noble2011-12-031-1/+1
| |
| * Alphabetize fields to make reading easierJason Noble2011-12-031-8/+31
| |
| * Improve wording, fix some formatting issuesJason Noble2011-12-031-4/+5
| |
| * Constrained to 80 chars per lineJason Noble2011-12-031-173/+367
| |
| * Update layouts and rendering guide javascript_include_tag to bring it in ↵Ryan Bigg2011-12-041-5/+42
| | | | | | | | line with Rails 3.1
* | Merge pull request #3850 from carlosantoniodasilva/readonly-attributesJosé Valim2011-12-041-1/+2
|\ \ | | | | | | Refactor readonly attributes conditional
| * | Refactor readonly attributes conditionalCarlos Antonio da Silva2011-12-041-1/+2
|/ /
* | Merge pull request #3848 from arunagw/sqlite3_bumpXavier Noria2011-12-042-2/+2
|\ \ | | | | | | SQlite3 Bump
| * | SQlite3 Bump Arun Agrawal2011-12-042-2/+2
|/ /
* | Add missing requireJon Leighton2011-12-031-0/+2
| |
* | Enable postgres on the CI :heart: :beer: :sparkles:Jon Leighton2011-12-032-1/+2
| |
* | Avoid postgres 9.X syntaxJon Leighton2011-12-031-1/+5
| |
* | Fix #3837.Jon Leighton2011-12-032-11/+17
| | | | | | | | | | We also need to time zone convert time zone aware attributes when accessed via read_attribute, not only when via direct access.
* | removes the convenience instance version of AR::Base.silence_auto_explainXavier Noria2011-12-035-99/+85
| | | | | | | | | | | | | | Rationale: As discussed with José and Jon, this convenience shortcut is not clearly justified and it could let the user thing the disabled EXPLAINs are related to the model instance rather than being globally disabled.
* | Merge pull request #3820 from jaylevitt/nested_loading_through_assocJon Leighton2011-12-032-1/+36
|\ \ | | | | | | reintroduce patch from #726 to handle nested eager loading via associations
| * | reintroduce patch from #726 to handle nested eager loading via associationsJay Levitt2011-11-302-1/+36
| | |
* | | Merge pull request #3833 from kennyj/fix_3678-3Jon Leighton2011-12-031-3/+8
|\ \ \ | | | | | | | | Use show create table (fix 3678: third time).
| * | | Use show create table.kennyj2011-12-031-3/+8
| | | |
* | | | Merge pull request #3842 from arunagw/app_gen_testJosé Valim2011-12-031-3/+3
|\ \ \ \ | | | | | | | | | | App Generator test
| * | | | Simplifying test in app/generatorArun Agrawal2011-12-031-3/+3
| | | | |
* | | | | Fix failing cascade exception.José Valim2011-12-033-2/+12
|/ / / /
* | | | Restore performance of ERB::Util.html_escapeJon Jensen2011-12-032-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert html_escape to do a single gsub again, but add the "n" flag (no language, i.e. not multi-byte) to protect against XSS via invalid utf8 Signed-off-by: José Valim <jose.valim@gmail.com>