aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fixing wildcard path matching when wildcard is inside parenthesisAaron Patterson2011-07-262-1/+8
* Merge pull request #2291 from jdelStrother/load_missing_constantAaron Patterson2011-07-261-2/+1
|\
| * Replace unnecessary regexp in Dependencies#load_missing_constantJonathan del Strother2011-07-271-2/+1
* | Merge pull request #2279 from jdelStrother/load_missing_constantSantiago Pastorino2011-07-261-1/+2
|\|
| * Constantize a regexp in Dependencies#load_missing_constantJonathan del Strother2011-07-261-1/+2
* | Remove blank lineSantiago Pastorino2011-07-261-1/+0
* | Merge pull request #2273 from thoefer/refactorSantiago Pastorino2011-07-261-5/+4
|\ \
| * | refactored 'assert_redirected_to': local call to validate_request! will be ca...thoefer2011-07-261-5/+4
* | | Remove cruise filesSantiago Pastorino2011-07-265-415/+0
* | | Merge pull request #2095 from dgeb/issue-2094Aaron Patterson2011-07-262-1/+18
|\ \ \
| * | | added test case for fix to issue #2094Dan Gebhardt2011-07-161-0/+17
| * | | fixed problem in which options[:html][:remote] would be overridden in form_fo...Dan Gebhardt2011-07-151-1/+1
* | | | Merge pull request #2285 from castlerock/remove_warnings_ruby193Santiago Pastorino2011-07-261-2/+0
|\ \ \ \
| * | | | remove unused variables warnings removedVishnu Atrai2011-07-261-2/+0
* | | | | Merge pull request #2284 from joshk/patch-6Santiago Pastorino2011-07-261-3/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | enable Travis CI irc notifications to #rails-contrib on irc.freenode.orgJosh Kalderimis2011-07-261-3/+5
|/ / / /
* | | | Merge pull request #2283 from castlerock/remove_warnings_ruby193Aaron Patterson2011-07-261-1/+1
|\ \ \ \
| * | | | remove deprication warning: ambiguous first argument; put parentheses or even...Vishnu Atrai2011-07-261-1/+1
|/ / / /
* | | | fixing tests on ruby trunkAaron Patterson2011-07-261-1/+1
* | | | 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 variablesVishnu Atrai2011-07-261-1/+1
|/ / / /
* | | | Merge pull request #2277 from dmathieu/fix_actionpack_testsJosé Valim2011-07-261-26/+26
|\ \ \ \
| * | | | 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
| |_|/ |/| |
* | | Merge pull request #2271 from slawosz/enhance_select_method_apiPiotr Sarnacki2011-07-262-3/+11
|\ \ \
| * | | 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. `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