aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* First, very early, AbstractController code. More to comeYehuda Katz2009-02-246-0/+190
* Remove errant debug codeYehuda Katz2009-02-031-2/+0
* Make tests passYehuda Katz2009-02-023-123/+2
* Whoops.Yehuda Katz2009-02-021-0/+40
* Add support for pendingYehuda Katz2009-02-023-9/+17
* Merge commit 'rails/3-0-unstable'Yehuda Katz2009-02-022-26/+0
|\
| * Remove dead cgi_ext requireJeremy Kemper2009-01-311-1/+0
| * Remove duplicate ConcurrentHashJeremy Kemper2009-01-311-25/+0
* | Some merge cleanupYehuda Katz2009-02-026-15/+137
* | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-30123-1122/+1437
|\|
| * Move dispatch related tests into test/dispatchJoshua Peek2009-01-2812-105/+111
| * Move HTTP libs and middleware into ActionDispatch componentJoshua Peek2009-01-2744-427/+134
| * Reorganize ActionController folder structureJoshua Peek2009-01-2768-559/+976
| * Begin unifying the interface between ActionController and ActionViewYehuda Katz2009-01-2251-556/+759
| * Merge branch 'master' into 3-0-unstableJoshua Peek2009-01-22273-16821/+17130
| |\
| * | Update CI configuration to reflect latest gems.Mike Gunderloy2009-01-074-9/+28
* | | Merge branch 'master' of git@github.com:wycats/railsYehuda Katz2009-01-300-0/+0
|\ \ \
| * \ \ Merge branch 'master' of git://github.com/rails/railslholden2009-01-21151-14775/+12855
| |\ \ \
* | \ \ \ Sync 'rails/rails/master'Yehuda Katz2009-01-30205-14977/+14070
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Ensure constant_watch_stack is protected by a mutex, so concurrent requires d...Charles Nutter2009-01-301-5/+14
| * | | | Controller, response, and request should all refer to same session, even afte...Scott Taylor2009-01-292-4/+42
| * | | | Deprecation tests for f17c876 [#1801 state:resolved]Mike Gaffney2009-01-291-0/+58
| * | | | Digest#validate_digest_response should accept request instead of controllerPratik Naik2009-01-291-6/+6
| * | | | Added grouped_options_for_select helper method for wrapping option tags in op...Jon Crawford2009-01-293-0/+84
| * | | | Implement HTTP Digest authentication. [#1230 state:resolved] [Gregg Kellogg, ...Gregg Kellogg2009-01-294-25/+326
| * | | | Sqlite adapter's copy_table incorrectly attempts to recreate a primary key id...Jacob Dunphy2009-01-293-1/+17
| * | | | Move to use pg instead of postgres on the CI serverMichael Koziarski2009-01-291-2/+2
| * | | | Only dup local cache values if duplicable [#1653 state:resolved]Joshua Peek2009-01-282-1/+13
| * | | | Move basic auth test controller inside the test classPratik Naik2009-01-291-21/+21
| * | | | Improve exception handling when Location header is invalid. [#1192 state:reso...Bob Aman2009-01-282-2/+15
| * | | | Using the highlight helper on text with html shouldn't highlight text inside ...Dan Weinand2009-01-282-1/+24
| * | | | Ensure whitespaces are stripped when merging string joins. [#1297 state:resol...Filip H.F. "FiXato" Slagter2009-01-282-1/+11
| * | | | Added options to script/dbconsole to sqlite3 console in various different mod...Bryan Ray2009-01-281-1/+17
| * | | | ActiveResource#eqls? and == should not take into account object identity and ...Rasik Pandey2009-01-282-2/+11
| * | | | Ensure selected option is not ignored for collection_select. [#1037 state:res...Daniel Rodríguez Troitiño2009-01-282-1/+18
| * | | | Ensure that when UrlWriter is included in multiple classes, the default_url_o...Nathan de Vries2009-01-282-7/+19
| * | | | Add array id support to Model.update_counters. [#1254 state:resolved] [Carlos...Pratik Naik2009-01-282-2/+24
| * | | | Session cookie header should always be set if :expire_after option is specifiedPratik Naik2009-01-283-8/+40
| * | | | Use toplevel reference to ::StringIO since we're in a BasicObject.Jeremy Kemper2009-01-271-2/+2
| * | | | Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2009-01-273-3/+5
| |\ \ \ \
| | * | | | Disable eager loading for all rake tasks [#802 state:resolved]Joshua Peek2009-01-273-3/+5
| * | | | | Fix for sweepers method_missing missing &block argument [#1581 status:committed]Tys von Gaza2009-01-271-2/+2
| |/ / / /
| * | | | Restore implicit rendering for XHR requests that want a HTML template [#1590 ...Joshua Peek2009-01-273-0/+12
| * | | | Fixed deprecated methods on TestSession [#1801 state:resolved]Joshua Peek2009-01-272-17/+21
| * | | | Dont use Memoizable for ActionController::RequestPratik Naik2009-01-274-76/+65
| * | | | Improve i18n support for number_to_human_size helper:Yaroslav Markin2009-01-274-23/+72
| * | | | Ensure the full path is used when searching for layouts [#1803 state:resolved]Joshua Peek2009-01-271-1/+1
| * | | | Mysql#reconnect is set according to the 'reconnect' key in the connection spec.Dov Murik2009-01-272-2/+31
| * | | | Fix for failing ActionMailer multipart testsJoshua Peek2009-01-261-2/+2
| * | | | Add localized templatesJoshua Peek2009-01-255-15/+67