aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixing whitespace errorsAaron Patterson2011-07-261-9/+9
|
* Merge pull request #2281 from castlerock/remove_warnings_ruby193Santiago Pastorino2011-07-261-1/+1
|\ | | | | remove deprication warning for ruby 1.9.3-head for unused variable
| * remove deprication warning for ruby 1.9.3-head for unused variablesVishnu Atrai2011-07-261-1/+1
|/
* Merge pull request #2277 from dmathieu/fix_actionpack_testsJosé Valim2011-07-261-26/+26
|\ | | | | Fix actionpack's test suite
| * use sprocket's append_path and assert_matchDamien Mathieu2011-07-261-26/+26
|/
* Revert "allow select to have multiple arguments"Piotr Sarnacki2011-07-262-11/+3
| | | | | | | This reverts commit 04cc446d178653d362510e79a22db5300d463161. I reverted it because apparently we want to use: select([:a, :b]) instead of select(:a, :b), but there was no tests for that form.
* Merge pull request #2271 from slawosz/enhance_select_method_apiPiotr Sarnacki2011-07-262-3/+11
|\ | | | | allow select to have multiple arguments ie. Post.select(:id,:name,:author)
| * allow select to have multiple argumentsSławosz Sławiński2011-07-262-3/+11
| |
* | Merge pull request #2272 from cesario/fix_relations_testSantiago Pastorino2011-07-261-1/+1
|\ \ | | | | | | Simplify the test by using id and name.
| * | Simplify the test by using id and name. `id` will be the only real sort ↵Franck Verrot2011-07-261-1/+1
|/ / | | | | | | criteria in any case as it's unique.
* | 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 ↵Santiago Pastorino2011-07-261-0/+8
| | | | | | | | config.action_dispatch.x_sendfile_header is set
* | Bump rack up. Closes #2107Santiago Pastorino2011-07-251-1/+1
| |
* | Merge pull request #2262 from sferik/format_trueJosé Valim2011-07-253-0/+15
|\ \ | | | | | | Allow a route to have :format => true
| * | Add documentation for :format => trueErik Michaels-Ober2011-07-251-0/+6
| | |
| * | Allow a route to have :format => trueErik Michaels-Ober2011-07-252-0/+9
| |/ | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
* | 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
| | | | | | | | | | | | Normally I would have done this in master, but there was already a guide with wrapped content, so worked here. I am going to cross-merge now.
| * Revert "aligment issues fixed"Vijay Dev2011-07-251-12/+9
| | | | | | | | | | | | This reverts commit 6f29b356c1e8cb73d8a696a393450a9ce4eeda57. Reason: Changelogs are not meant to be changed in docrails.
| * aligment issues fixedJudeArasu2011-07-251-9/+12
| |
| * Revert "Add in a tip about opening two command prompt windows"Vijay Dev2011-07-251-5/+0
| | | | | | | | | | | | | | This reverts commit 1e5fa59d132562399536a3ca06295b60558bc258. Reason: It's somewhat a grey area. We don't really want to tell the users how they want to use the terminal.
| * Revert "Update the TIP formatter to handle multiline tips"Vijay Dev2011-07-252-39/+1
| | | | | | | | | | | | This reverts commit e3dbe66e196069fde7d3ff118bd25a03184915fa. Reason: Code changes are not allowed in docrails.
| * 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
| | | | | | | | | | | | | | | Rewrote entire section including example code, error message, and work around.
| | * 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 ↵Jason Noble & Ralph Shnelvar2011-07-241-0/+2
| | | | | | | | | | | | the linux/osx prompt
| * | 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
| | | | | | | | | | | | - includes 3 tests
| * | Merge branch 'master' of github.com:lifo/docrailsMichael Lavrisha2011-07-241-214/+573
| |\| | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| | * 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
| |\| | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile
| | * 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 ↵Santiago Pastorino2011-07-252-6/+25
|\ \ | | | | | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly
| * | Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-252-6/+25
| | | | | | | | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints.
* | | Simplify the way default DATABASE_URL works.Glenn Gillen2011-07-251-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-27 00:38:16 +0000