Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of github.com:lifo/docrails | Sergey Parizhskiy | 2011-12-05 | 1 | -1/+1 |
|\ | |||||
| * | Remove redundant or | Jason Noble | 2011-12-05 | 1 | -1/+1 |
| | | |||||
* | | changes in the way of how the stylesheets_link_tag works | Sergey Parizhskiy | 2011-12-05 | 1 | -5/+9 |
|/ | |||||
* | Merge branch 'master' of github.com:lifo/docrails | Vijay Dev | 2011-12-04 | 2 | -158/+422 |
|\ | |||||
| * | copy edits in the migrations guide | Vijay Dev | 2011-12-04 | 1 | -48/+46 |
| | | |||||
| * | Be explicit about where to add/remove stuff to the migration | Jason Noble | 2011-12-03 | 1 | -1/+2 |
| | | |||||
| * | Fix missing /ruby block | Jason Noble | 2011-12-03 | 1 | -0/+1 |
| | | |||||
| * | Be explicit of where the constraints are. | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Improve readability | Jason Noble | 2011-12-03 | 1 | -4/+5 |
| | | |||||
| * | Be more friendly than "shut up" | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | A table format makes this section easier to read | Jason Noble | 2011-12-03 | 1 | -7/+11 |
| | | |||||
| * | This section is more about changing the output of running migrations | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Improve readability | Jason Noble | 2011-12-03 | 1 | -2/+2 |
| | | |||||
| * | Readability improvements | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Move this into a section so that "Resetting the database" will show up in TOC | Jason Noble | 2011-12-03 | 1 | -1/+3 |
| | | |||||
| * | Change wording to be more explicit on what migrating with a version does | Jason Noble | 2011-12-03 | 1 | -2/+3 |
| | | |||||
| * | Migrations can also run the "change" method | Jason Noble | 2011-12-03 | 1 | -3/+3 |
| | | |||||
| * | Reword section to make it more readable. | Jason Noble | 2011-12-03 | 1 | -4/+7 |
| | | |||||
| * | We're using methods, not writing them | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Change wording to be more understandable | Jason Noble | 2011-12-03 | 1 | -2/+2 |
| | | |||||
| * | We're using the method, not writing it | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Change The other... to Another... | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Reword confusing section | Jason Noble | 2011-12-03 | 1 | -4/+2 |
| | | |||||
| * | Correct grammatical errors | Jason Noble | 2011-12-03 | 1 | -2/+2 |
| | | |||||
| * | It's more that Rails needs to know how to recreate the columns | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Added "also" to read better | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Explain the t.timestamps method a little better | Jason Noble | 2011-12-03 | 1 | -3/+4 |
| | | |||||
| * | Re-word confusing section | Jason Noble | 2011-12-03 | 1 | -4/+3 |
| | | |||||
| * | Rollback is used elsewhere in the tutorial | Jason Noble | 2011-12-03 | 1 | -1/+1 |
| | | |||||
| * | Alphabetize fields to make reading easier | Jason Noble | 2011-12-03 | 1 | -8/+31 |
| | | |||||
| * | Improve wording, fix some formatting issues | Jason Noble | 2011-12-03 | 1 | -4/+5 |
| | | |||||
| * | Constrained to 80 chars per line | Jason Noble | 2011-12-03 | 1 | -173/+367 |
| | | |||||
| * | Update layouts and rendering guide javascript_include_tag to bring it in ↵ | Ryan Bigg | 2011-12-04 | 1 | -5/+42 |
| | | | | | | | | line with Rails 3.1 | ||||
* | | Merge pull request #3850 from carlosantoniodasilva/readonly-attributes | José Valim | 2011-12-04 | 1 | -1/+2 |
|\ \ | | | | | | | Refactor readonly attributes conditional | ||||
| * | | Refactor readonly attributes conditional | Carlos Antonio da Silva | 2011-12-04 | 1 | -1/+2 |
|/ / | |||||
* | | Merge pull request #3848 from arunagw/sqlite3_bump | Xavier Noria | 2011-12-04 | 2 | -2/+2 |
|\ \ | | | | | | | SQlite3 Bump | ||||
| * | | SQlite3 Bump | Arun Agrawal | 2011-12-04 | 2 | -2/+2 |
|/ / | |||||
* | | Add missing require | Jon Leighton | 2011-12-03 | 1 | -0/+2 |
| | | |||||
* | | Enable postgres on the CI :heart: :beer: :sparkles: | Jon Leighton | 2011-12-03 | 2 | -1/+2 |
| | | |||||
* | | Avoid postgres 9.X syntax | Jon Leighton | 2011-12-03 | 1 | -1/+5 |
| | | |||||
* | | Fix #3837. | Jon Leighton | 2011-12-03 | 2 | -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_explain | Xavier Noria | 2011-12-03 | 5 | -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_assoc | Jon Leighton | 2011-12-03 | 2 | -1/+36 |
|\ \ | | | | | | | reintroduce patch from #726 to handle nested eager loading via associations | ||||
| * | | reintroduce patch from #726 to handle nested eager loading via associations | Jay Levitt | 2011-11-30 | 2 | -1/+36 |
| | | | |||||
* | | | Merge pull request #3833 from kennyj/fix_3678-3 | Jon Leighton | 2011-12-03 | 1 | -3/+8 |
|\ \ \ | | | | | | | | | Use show create table (fix 3678: third time). | ||||
| * | | | Use show create table. | kennyj | 2011-12-03 | 1 | -3/+8 |
| | | | | |||||
* | | | | Merge pull request #3842 from arunagw/app_gen_test | José Valim | 2011-12-03 | 1 | -3/+3 |
|\ \ \ \ | | | | | | | | | | | App Generator test | ||||
| * | | | | Simplifying test in app/generator | Arun Agrawal | 2011-12-03 | 1 | -3/+3 |
| | | | | | |||||
* | | | | | Fix failing cascade exception. | José Valim | 2011-12-03 | 3 | -2/+12 |
|/ / / / | |||||
* | | | | Restore performance of ERB::Util.html_escape | Jon Jensen | 2011-12-03 | 2 | -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> |