aboutsummaryrefslogtreecommitdiffstats
path: root/railties
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3908 from kennyj/should_use_default_charsetJosé Valim2011-12-081-2/+3
|\ | | | | Fix a failure in railties on ruby 1.8.x
| * Fix testcase an error on ruby 1.8.x.kennyj2011-12-091-2/+3
| | | | | | | | | | | | In Ruby 1.8.x, config.encoding sets $KCODE. Therefore, the possible values are UTF8, SJIS, or EUC. And, if we set SJIS, we'll has the error. Because some rails sources are written in utf-8 encoding.
* | Merge pull request #3888 from kennyj/should_use_default_charsetJosé Valim2011-12-081-0/+6
|\| | | | | Assign config.encoding to AD::Response.default_charset at the initialization time.
| * Assign config.encoding to AD::Response.default_charset at the initialization ↵kennyj2011-12-071-0/+6
| | | | | | | | time.
* | Moves migrations tests from railties/test/application/rake_test.rb to ↵Kazimierz Kiełkowicz2011-12-072-68/+85
| | | | | | | | railties/test/application/rake/migrations_test.rb
* | Move rake notes test to railties/test/application/rake/notes_test.rbKazimierz Kiełkowicz2011-12-072-42/+45
| |
* | Update source_annotation_extractor comment.Kazimierz Kiełkowicz2011-12-071-1/+1
| |
* | Add annotation to haml and slim template.Kazimierz Kiełkowicz2011-12-072-0/+46
| |
* | Merge branch 'master' of github.com:lifo/docrailsVijay Dev2011-12-065-13/+17
|\ \ | |/ |/|
| * use textile syntax in linksVijay Dev2011-12-061-1/+1
| |
| * rxml and rhtml are no longer searched for source code annotationsVijay Dev2011-12-061-1/+1
| |
| * copy edits in layouts guide, change links to be relativeVijay Dev2011-12-061-6/+6
| |
| * Added git --rebase option for pulling rails masterThomas von Deyen2011-12-061-1/+1
| |
| * Added wiki link to RESTsandeepravi2011-12-061-1/+1
| |
| * Added wiki link for RESTsandeepravi2011-12-061-1/+1
| |
| * 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
| |/
* / Remove .rxml, .rjs and .rhtml from source annotation regexp.Uģis Ozols2011-12-051-5/+5
|/
* 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
* | removes the convenience instance version of AR::Base.silence_auto_explainXavier Noria2011-12-031-3/+2
| | | | | | | | | | | | | | 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.