aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-06-0761-501/+899
|\
| * regular expressions are usually ASCII-encoded, so force_encoding the content ...wycats2010-06-072-2/+1
| * Add delete to middleware stack proxy.José Valim2010-06-073-1/+11
| * Fix case when rendering a partial inside RJS with inherited layout [#4786 sta...José Valim2010-06-072-1/+4
| * Updating ActionMailer to Mail 2.2.2 (fixing two tests to suit)Mikel Lindsaar2010-06-072-4/+4
| * Makes text_helper methods sanitize the input if the input is not safe or :saf...Santiago Pastorino2010-06-072-22/+118
| * content_tag_string shouldn't escape_html if escape param is falseSantiago Pastorino2010-06-072-1/+3
| * Make named helpers unprotected without becoming actions [#4696 state:resolved]wycats2010-06-072-1/+12
| * Fixed Load Error failures in 1.9.2-headRizwan Reza2010-06-071-0/+1
| * bump sqlite version to 1.3.0Santiago Pastorino2010-06-071-1/+1
| * Merge remote branch 'rails/master'Xavier Noria2010-06-0734-189/+266
| |\
| | * member on resource should not expect an ID.José Valim2010-06-072-6/+3
| | * Make the logic for nested_records_changed_for_autosave? simpler.José Valim2010-06-071-9/+5
| | * Fixing test class names and refactor line in autosave associationCarlos Antonio da Silva2010-06-073-7/+7
| | * Require active support/string/conversions so constantize can be used in assoc...Tom Meier2010-06-071-0/+1
| | * Make AP test suite green once again and speed up performance in layouts looku...José Valim2010-06-074-45/+39
| | * Observing module is using constantizeSantiago Pastorino2010-06-061-0/+1
| | * oops, two cancelling errors made a previous test pass, fixing itXavier Noria2010-06-071-1/+1
| | * the order in which we apply deltas in Date#advance matters, add test coverage...Xavier Noria2010-06-071-0/+10
| | * Router accepts member routes on resource. [#4624 state:resolved]Rizwan Reza2010-06-062-5/+27
| | * Formats should always be an array.Jeremy Kemper2010-06-061-1/+1
| | * Reset request.parameters after assigning params for functional testsJeremy Kemper2010-06-061-2/+4
| | * Simplify middleware stack lazy compares using named const referencesJeremy Kemper2010-06-051-13/+5
| | * Clear const references all at onceJeremy Kemper2010-06-051-6/+9
| | * ActiveSupport::Dependencies.constantize shortcut for caching named constant l...Jeremy Kemper2010-06-054-14/+26
| | * Bump i18n to 0.4.1Jeremy Kemper2010-06-052-2/+2
| | * Restore flash sweepJeremy Kemper2010-06-051-1/+1
| | * MySQL: require 2.7 or later so we can rely on result.each_hashJeremy Kemper2010-06-051-49/+8
| | * Optimize LookupContextwycats2010-06-046-14/+75
| | * Small optimization of 1.9 unescape. We should make sure that inbound ASCII al...wycats2010-06-041-2/+6
| | * No need to unescape params twice if we came from Rack::Mountwycats2010-06-041-7/+7
| | * Memoizing methods on request means we need to clear them out on recycle!wycats2010-06-041-3/+3
| | * Stop the flash middleware from forcibly loading sessions even if the user doe...wycats2010-06-042-6/+6
| | * Whoops. _run_*_callbacks is privatewycats2010-06-041-1/+1
| | * Improve performance of the Logger middleware by using simpler versions of met...wycats2010-06-041-3/+4
| | * Improve performance of MessageVerifier while keeping it constant timewycats2010-06-041-4/+4
| | * Improve performance of the log subscriber by remembering the list of all logg...wycats2010-06-041-3/+10
| | * Eliminate the need to check for superclass changes to the callback stack each...wycats2010-06-041-3/+6
| | * Use faster form of running callbackswycats2010-06-041-1/+1
| | * Improve performance of commonly used request methodswycats2010-06-041-7/+19
| | * Include backtrace in failsafe log. Rescue possible exceptions in failsafe res...Jeremy Kemper2010-06-042-2/+2
| * | AS guide: first complete draft covering date/calculations.rbXavier Noria2010-06-061-2/+111
| |/
| * Readme file changes:Rizwan Reza2010-06-052-112/+46
| * Merge branch 'master' of git://github.com/rails/railsRizwan Reza2010-06-0538-64/+173
| |\
| | * AS guide: removes your spurious lineXavier Noria2010-06-051-2/+0
| | * removes Array#random_element and backports Array#sample from Ruby 1.9, thanks...Xavier Noria2010-06-058-25/+66
| | * Missed fixing the banner on the Usage output for ThorMikel Lindsaar2010-06-041-1/+1
| | * Updating guides to new rails initialization processMikel Lindsaar2010-06-044-7/+7
| | * Changing command line API from 'rails blog' to 'rails new blog'.Mikel Lindsaar2010-06-044-5/+15
| | * Properly cache association_collection#scopes calls having argumentsPratik Naik2010-06-043-1/+16