aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-03-1420-76/+217
|\
| * Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 st...Joshua Peek2009-03-132-14/+1
| * Update rack to fix multipart uploads with an empty file [#1945 state:resolved]Joshua Peek2009-03-1314-43/+99
| * Change naming to match 2.2 so life is easier on plugin developersJeremy Kemper2009-03-121-5/+5
| * Eliminate internal render stack since we only need its head and tailJeremy Kemper2009-03-122-17/+27
| * Handle irregular plurals in polymorphic_urls [#2212 state:resolved]Mike Gunderloy2009-03-122-2/+90
* | Merge commit 'mainstream/master'Pratik Naik2009-03-1227-87/+256
|\|
| * Support MD5 passwords for Digest auth and use session_options[:secret] in non...Donald Parish2009-03-122-28/+97
| * Update bundled Rack to fix Litespeed compatibility [#2198 state:resolved]Russ Smith2009-03-117-10/+25
| * Ensure correct content type is declared after cache hits on actions with stri...Mislav Marohnić2009-03-102-17/+24
| * check for rack 1.0 gem before falling back to bundled versionJoshua Peek2009-03-101-1/+6
| * update bundled version of rack before 2.3 finalJoshua Peek2009-03-1010-11/+42
| * remove rack gem dependencyJoshua Peek2009-03-101-1/+0
| * Add a missing CHANGELOG entryPratik Naik2009-03-101-0/+2
| * Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 state:reso...Eugene Pimenov2009-03-102-2/+9
| * reset_session should force a new session id to be generated [#2173]Joshua Peek2009-03-093-16/+50
* | Fix some typos, including a global "seperator" -> "separator".Henrik N2009-03-123-4/+4
* | Revert "Updated actionpack/CHANGELOG to include enhancements to form option h...Pratik Naik2009-03-101-2/+0
* | Merge branch 'master' of git://github.com/lifo/docrailsTekin Suleyman2009-03-1049-219/+661
|\ \
| * | Merge commit 'mainstream/master'Pratik Naik2009-03-1049-219/+661
| |\|
| | * Ensure blank path_prefix works as expected [#2122 state:resolved]Andrew Bloom2009-03-092-3/+34
| | * Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved]rpheath2009-03-092-1/+4
| | * Prototype helpers support the onCreate callback.Jeremy Kemper2009-03-081-1/+1
| | * Ruby 1.9 compat: rename deprecated assert_raises to assert_raise.Jeremy Kemper2009-03-0813-90/+90
| | * Remove duplicate test [#2136 state:resolved]Yury Kotlyarov2009-03-081-5/+0
| | * Support OPTIONS verb in route conditions [#1727 state:resolved]Mike Gunderloy2009-03-082-1/+9
| | * Ensure shallow routes respects namespace [#1356 state:resolved]Tom Stuart2009-03-072-5/+33
| | * Fixed simplified render with nested models [#2042 state:resolved]Joshua Peek2009-03-075-0/+34
| | * fix HTML fallback for explicit templates [#2052 state:resolved]Matt Jones2009-03-073-5/+22
| | * submit_tag with confirmation and disable_with [#660 state:resolved]Lawrence Pit2009-03-072-4/+11
| | * Ensure Active Record error related view helpers escape the message [#1280 sta...Dan Barry2009-03-072-2/+36
| | * Ensure assert_select works with XML namespaced attributes [#1547 state:resolv...Pratik Naik2009-03-072-1/+6
| | * Remove unused variable [#1451 state:resolved] [Raphaël Valyi]Pratik Naik2009-03-071-1/+0
| | * Ensure expires_in without a :public key sets the Cache-Control header to priv...Johan Sørensen2009-03-072-2/+4
| | * Fix layouts with absolute paths [#2134 state:resolved]thedarkone2009-03-052-2/+11
| | * Failing test for routes with member & requirement [#2054 state:resolved]Mike Gunderloy2009-03-052-1/+14
| | * Fixed that redirection would just log the options, not the final url (which l...David Heinemeier Hansson2009-03-052-1/+3
| | * Release RC2 todayDavid Heinemeier Hansson2009-03-051-1/+1
| | * Generating routes with optional format segment does not inherit params format...Joshua Peek2009-03-042-1/+21
| | * Allow routes with a trailing slash to be recognizedMike Gunderloy2009-03-042-3/+11
| | * Fixed reset_session for ActiveRecord session store [#2108 state:resolved]Joshua Peek2009-03-031-0/+21
| | * Use Array.wrap() instead of Array() and handle action_view.cache_template_loa...Pratik Naik2009-02-281-1/+1
| | * Ensure the old behaviour is retained when action_view.cache_template_loading ...Pratik Naik2009-02-281-3/+3
| | * Fix spelling in test name.Mike Gunderloy2009-02-281-1/+1
| | * Added ability to pass in :public => true to fresh_when, stale?, and expires_i...Gregg Pollack2009-02-283-7/+109
| | * So it didnt happen yesterday, but very soon! Just need the final details iron...David Heinemeier Hansson2009-02-281-1/+1
| | * Prep for RC2 later todayDavid Heinemeier Hansson2009-02-273-3/+3
| | * Force all internal calls to Array#to_sentence to use English [#2010 state:res...David Heinemeier Hansson2009-02-272-3/+3
| | * Pass a custom form builder on to nested fields_for calls. [#2023 status:commi...Eloy Duran2009-02-273-49/+126
| | * Ruby 1.9 compat: silence a warning about regexp languagesSam Granieri2009-02-251-1/+5