aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| * | add #available_locales to I18n and I18n::SimpleBackend, flatten translations ...Sven Fuchs2009-01-253-1/+34
| * | add an inspect method to OrderedHash to make it clear that it is not a specie...Greg Borenstein2009-01-261-0/+4
| * | Adding AR tests for JDBC connectionsStephen Bannasch2009-01-267-2/+137
| * | Remove the irrelevant fixture added in fe6ffce51dc16285094be49244b26591956c2dd6Pratik Naik2009-01-241-8/+0
| * | Make sure inner scope conditions get a preference over the outer onesPratik Naik2009-01-245-3/+43
| * | Fix the changelog entryPratik Naik2009-01-231-2/+2
| * | Minor refactoring of validates_associated to replace #inject with #collect + ...Josh Susser2009-01-221-1/+1
| |/
| * Setup ActiveRecord QueryCache middleware in the initializerJoshua Peek2009-01-212-5/+4
| * Only insert metal middleware if any existJoshua Peek2009-01-211-1/+3
| * Missed RequestParser in ff0a267Joshua Peek2009-01-211-1/+0
| * Allow empty files to be uploadedJoshua Peek2009-01-204-4/+22
| * Add MiddlewareStack#swapJoshua Peek2009-01-202-5/+16
| * Don't let empty Tempfiles come through as uploaded files [#1785 state:resolved]Mislav Marohnić2009-01-203-1/+17
| * Restore cookie store httponly default to true. Remove extraneous dup of optio...Cody Fauser2009-01-202-5/+3
| * Deprecate ActionController::Base#session_enabled?Pratik Naik2009-01-191-1/+1
| * Improve HTTP Basic authentication testsPratik Naik2009-01-182-54/+88