aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3857 from Overbryd/redirect_to_url_with_network_path_refe...José Valim2011-12-052-2/+12
|\
| * Fix for redirect_to to respect urls with a network path reference like "//ass...Overbryd2011-12-052-2/+12
|/
* Merge pull request #3854 from exviva/validates_associated_marked_for_destructionJosé Valim2011-12-042-2/+13
|\
| * Do not validate associated records marked for destructionOlek Janiszewski2011-12-052-2/+13
* | Merge pull request #3851 from ebeigarts/fix_sequence_nameJon Leighton2011-12-042-2/+12
|\ \ | |/ |/|
| * Fix sequence name with abstract classes.Edgars Beigarts2011-12-042-2/+12
* | moves some auto explain logic to the subscriber [José Valim & Xavier Noria]Xavier Noria2011-12-042-19/+12
* | simplifies ActiveRecord::ExplainSubscriber [José Valim & Xavier Noria]Xavier Noria2011-12-041-8/+6
* | Merge branch 'explain'Xavier Noria2011-12-046-84/+93
|\ \
| * | implements a much faster auto EXPLAIN, closes #3843 [José Valim & Xavier Noria]Xavier Noria2011-12-046-84/+93
* | | Merge pull request #3853 from nashby/form_for_as_optionJosé Valim2011-12-043-13/+25
|\ \ \
| * | | form_for with +:as+ option uses "action_as" as css class and idVasiliy Ermolovich2011-12-043-13/+25
* | | | Merge pull request #3845 from sumbach/test-return-value-from-requireAaron Patterson2011-12-041-0/+79
|\ \ \ \
| * | | | Simplify load and require testsSam Umbach2011-12-031-4/+4
| * | | | Test that require and load raise LoadError if file not foundSam Umbach2011-12-031-0/+16
| * | | | Test return value of ActiveSupport::Dependencies::Loadable#loadSam Umbach2011-12-031-0/+16
| * | | | Test return value of ActiveSupport::Dependencies::Loadable#requireSam Umbach2011-12-031-0/+47
* | | | | 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 line...Ryan Bigg2011-12-041-5/+42
| |/ / /
* | | | Merge pull request #3850 from carlosantoniodasilva/readonly-attributesJosé Valim2011-12-041-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | Refactor readonly attributes conditionalCarlos Antonio da Silva2011-12-041-1/+2
|/ / /
* | | Merge pull request #3848 from arunagw/sqlite3_bumpXavier Noria2011-12-042-2/+2
|\ \ \ | |_|/ |/| |