aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2272 from cesario/fix_relations_testSantiago Pastorino2011-07-261-1/+1
|\
| * Simplify the test by using id and name. `id` will be the only real sort crite...Franck Verrot2011-07-261-1/+1
|/
* use_sprockets is not used anymoreSantiago Pastorino2011-07-261-5/+1
* Bump sprockets upSantiago Pastorino2011-07-261-1/+1
* Check that Rack::Sendfile is not included unless config.action_dispatch.x_sen...Santiago Pastorino2011-07-261-0/+8
* Bump rack up. Closes #2107Santiago Pastorino2011-07-251-1/+1
* Merge pull request #2262 from sferik/format_trueJosé Valim2011-07-253-0/+15
|\
| * Add documentation for :format => trueErik Michaels-Ober2011-07-251-0/+6
| * Allow a route to have :format => trueErik Michaels-Ober2011-07-252-0/+9
* | Remove unused use_sprockets configSantiago Pastorino2011-07-252-8/+1
* | Don't use Rack::Sendfile middleware if x_sendfile_header is not presentSantiago Pastorino2011-07-251-1/+3
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-259-281/+731
|\ \ | |/ |/|
| * let TIP and friends handle a multiline paragraphXavier Noria2011-07-252-18/+19
| * Revert "aligment issues fixed"Vijay Dev2011-07-251-12/+9
| * aligment issues fixedJudeArasu2011-07-251-9/+12
| * Revert "Add in a tip about opening two command prompt windows"Vijay Dev2011-07-251-5/+0
| * Revert "Update the TIP formatter to handle multiline tips"Vijay Dev2011-07-252-39/+1
| * Improve ch. 1 of the Form Helpers guideElliot Winkler2011-07-241-46/+28
| * Add in a tip about opening two command prompt windowsJason Noble & Ralph Shnelvar2011-07-241-0/+5
| * Fix two spaces after end of sentence.Jason Noble & Ralph Shnelvar2011-07-241-2/+2
| * Extend description of rails generate scaffold and what it's options accomplishJason Noble & Ralph Shnelvar2011-07-241-0/+4
| * Merge branch 'master' of github.com:lifo/docrailsMichael Lavrisha2011-07-244-40/+98
| |\
| | * Updated migrations.textile to clarify Using Models in Your MigrationsMike Howard2011-07-241-18/+85
| | * Make the rails not found tip more explanatory.Jason Noble & Ralph Shnelvar2011-07-241-2/+2
| | * Updated rails_welcome.png to latest Rails welcome page.Jason Noble & Ralph Shnelvar2011-07-241-0/+0
| | * Update wording of TIP about --database option for rails newJason Noble & Ralph Shnelvar2011-07-241-6/+6
| | * Remove "bundle install" section, as rails new ______ runs bundle install for youJason Noble & Ralph Shnelvar2011-07-241-12/+0
| | * Fixed TypoJohn2011-07-241-1/+1
| | * Fix TIP formatting issueJason Noble & Ralph Shnelvar2011-07-241-1/+2
| | * Add a note about the fact that the Windows prompt will look different than th...Jason Noble & Ralph Shnelvar2011-07-241-0/+2
| * | Simpler brief explanation of Rails and RESTMichael Lavrisha2011-07-241-3/+2
| * | Update the TIP formatter to handle multiline tipsMichael Lavrisha2011-07-242-1/+39
| * | Merge branch 'master' of github.com:lifo/docrailsMichael Lavrisha2011-07-241-214/+573
| |\|
| | * Reformatted to 80 chars.Jason Noble & Ralph Shnelvar2011-07-241-216/+573
| * | Merge branch 'master' of github.com:lifo/docrailsMichael Lavrisha2011-07-241-29/+76
| |\|
| | * Wrapped text content to 120 charsJason Noble & Ralph Shnelvar2011-07-241-30/+79
| * | Rewrite apart of the REST section to be in the present tenseMichael Lavrisha2011-07-241-2/+2
| |/
| * Provide consistant indentation for the example codeMichael Lavrisha2011-07-241-8/+8
| * Fix example code for #validates_with instance methodBen Marini2011-07-241-2/+2
* | Merge pull request #2245 from davidtrogers/constraints_block_passed_to_follow...Santiago Pastorino2011-07-252-6/+25
|\ \
| * | Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-252-6/+25
* | | Simplify the way default DATABASE_URL works.Glenn Gillen2011-07-251-1/+1
* | | no need for an anonymous class on every setup callAaron Patterson2011-07-251-10/+9
* | | Merge pull request #2258 from thedarkone/no-file-statJosé Valim2011-07-254-5/+5
|\ \ \
| * | | Use shorter class-level File methods instead of going through File.stat.thedarkone2011-07-254-5/+5
| |/ /
* | | Merge pull request #2236 from cldwalker/after_initializeSantiago Pastorino2011-07-253-2/+19
|\ \ \
| * | | use existing model for testing Base.create with #after_initializeGabriel Horner2011-07-244-23/+12
| * | | simplify and be more explicit about create and after_initialize testsGabriel Horner2011-07-242-24/+12
| * | | fix after_initialize edge case (close #2074 and close #2175)Les Fletcher2011-07-244-2/+42
* | | | Merge pull request #2254 from dmathieu/test_nameJosé Valim2011-07-251-2/+2
|\ \ \ \