Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | Revert "allow select to have multiple arguments" | Piotr Sarnacki | 2011-07-26 | 2 | -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_api | Piotr Sarnacki | 2011-07-26 | 2 | -3/+11 | |
|\ \ \ \ \ | | | | | | | | | | | | | allow select to have multiple arguments ie. Post.select(:id,:name,:author) | |||||
| * | | | | | allow select to have multiple arguments | Sławosz Sławiński | 2011-07-26 | 2 | -3/+11 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #2272 from cesario/fix_relations_test | Santiago Pastorino | 2011-07-26 | 1 | -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 Verrot | 2011-07-26 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | | | | | criteria in any case as it's unique. | |||||
* | | | | use_sprockets is not used anymore | Santiago Pastorino | 2011-07-26 | 1 | -5/+1 | |
| | | | | ||||||
* | | | | Bump sprockets up | Santiago Pastorino | 2011-07-26 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Check that Rack::Sendfile is not included unless ↵ | Santiago Pastorino | 2011-07-26 | 1 | -0/+8 | |
| | | | | | | | | | | | | | | | | config.action_dispatch.x_sendfile_header is set | |||||
* | | | | Bump rack up. Closes #2107 | Santiago Pastorino | 2011-07-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #2262 from sferik/format_true | José Valim | 2011-07-25 | 3 | -0/+15 | |
|\ \ \ \ | | | | | | | | | | | Allow a route to have :format => true | |||||
| * | | | | Add documentation for :format => true | Erik Michaels-Ober | 2011-07-25 | 1 | -0/+6 | |
| | | | | | ||||||
| * | | | | Allow a route to have :format => true | Erik Michaels-Ober | 2011-07-25 | 2 | -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 config | Santiago Pastorino | 2011-07-25 | 2 | -8/+1 | |
| | | | | ||||||
* | | | | Don't use Rack::Sendfile middleware if x_sendfile_header is not present | Santiago Pastorino | 2011-07-25 | 1 | -1/+3 | |
| | | | | ||||||
* | | | | Merge branch 'master' of git://github.com/lifo/docrails | Xavier Noria | 2011-07-25 | 9 | -281/+731 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | let TIP and friends handle a multiline paragraph | Xavier Noria | 2011-07-25 | 2 | -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 Dev | 2011-07-25 | 1 | -12/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 6f29b356c1e8cb73d8a696a393450a9ce4eeda57. Reason: Changelogs are not meant to be changed in docrails. | |||||
| * | | | aligment issues fixed | JudeArasu | 2011-07-25 | 1 | -9/+12 | |
| | | | | ||||||
| * | | | Revert "Add in a tip about opening two command prompt windows" | Vijay Dev | 2011-07-25 | 1 | -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 Dev | 2011-07-25 | 2 | -39/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit e3dbe66e196069fde7d3ff118bd25a03184915fa. Reason: Code changes are not allowed in docrails. | |||||
| * | | | Improve ch. 1 of the Form Helpers guide | Elliot Winkler | 2011-07-24 | 1 | -46/+28 | |
| | | | | ||||||
| * | | | Add in a tip about opening two command prompt windows | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -0/+5 | |
| | | | | ||||||
| * | | | Fix two spaces after end of sentence. | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | Extend description of rails generate scaffold and what it's options accomplish | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -0/+4 | |
| | | | | ||||||
| * | | | Merge branch 'master' of github.com:lifo/docrails | Michael Lavrisha | 2011-07-24 | 4 | -40/+98 | |
| |\ \ \ | ||||||
| | * | | | Updated migrations.textile to clarify Using Models in Your Migrations | Mike Howard | 2011-07-24 | 1 | -18/+85 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Rewrote entire section including example code, error message, and work around. | |||||
| | * | | | Make the rails not found tip more explanatory. | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -2/+2 | |
| | | | | | ||||||
| | * | | | Updated rails_welcome.png to latest Rails welcome page. | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -0/+0 | |
| | | | | | ||||||
| | * | | | Update wording of TIP about --database option for rails new | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -6/+6 | |
| | | | | | ||||||
| | * | | | Remove "bundle install" section, as rails new ______ runs bundle install for you | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -12/+0 | |
| | | | | | ||||||
| | * | | | Fixed Typo | John | 2011-07-24 | 1 | -1/+1 | |
| | | | | | ||||||
| | * | | | Fix TIP formatting issue | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -1/+2 | |
| | | | | | ||||||
| | * | | | Add a note about the fact that the Windows prompt will look different than ↵ | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -0/+2 | |
| | | | | | | | | | | | | | | | | | | | | the linux/osx prompt | |||||
| * | | | | Simpler brief explanation of Rails and REST | Michael Lavrisha | 2011-07-24 | 1 | -3/+2 | |
| | | | | | ||||||
| * | | | | Update the TIP formatter to handle multiline tips | Michael Lavrisha | 2011-07-24 | 2 | -1/+39 | |
| | | | | | | | | | | | | | | | | | | | | - includes 3 tests | |||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Michael Lavrisha | 2011-07-24 | 1 | -214/+573 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile | |||||
| | * | | | Reformatted to 80 chars. | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -216/+573 | |
| | | | | | ||||||
| * | | | | Merge branch 'master' of github.com:lifo/docrails | Michael Lavrisha | 2011-07-24 | 1 | -29/+76 | |
| |\| | | | | | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/source/getting_started.textile | |||||
| | * | | | Wrapped text content to 120 chars | Jason Noble & Ralph Shnelvar | 2011-07-24 | 1 | -30/+79 | |
| | | | | | ||||||
| * | | | | Rewrite apart of the REST section to be in the present tense | Michael Lavrisha | 2011-07-24 | 1 | -2/+2 | |
| |/ / / | ||||||
| * | | | Provide consistant indentation for the example code | Michael Lavrisha | 2011-07-24 | 1 | -8/+8 | |
| | | | | ||||||
| * | | | Fix example code for #validates_with instance method | Ben Marini | 2011-07-24 | 1 | -2/+2 | |
| | | | | ||||||
* | | | | Merge pull request #2245 from ↵ | Santiago Pastorino | 2011-07-25 | 2 | -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 route | Dave Rogers | 2011-07-25 | 2 | -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 Gillen | 2011-07-25 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | no need for an anonymous class on every setup call | Aaron Patterson | 2011-07-25 | 1 | -10/+9 | |
| | | | | ||||||
* | | | | Merge pull request #2258 from thedarkone/no-file-stat | José Valim | 2011-07-25 | 4 | -5/+5 | |
|\ \ \ \ | | | | | | | | | | | Use shorter class-level File methods instead of going through File.stat | |||||
| * | | | | Use shorter class-level File methods instead of going through File.stat. | thedarkone | 2011-07-25 | 4 | -5/+5 | |
| |/ / / | ||||||
* | | | | Merge pull request #2236 from cldwalker/after_initialize | Santiago Pastorino | 2011-07-25 | 3 | -2/+19 | |
|\ \ \ \ | | | | | | | | | | | Fix after_initialize and Base.create edge case | |||||
| * | | | | use existing model for testing Base.create with #after_initialize | Gabriel Horner | 2011-07-24 | 4 | -23/+12 | |
| | | | | |