aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* 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
| * missed template fixtures with ~Joshua Peek2009-02-243-0/+3
| * Ensure ActiveRecord session store's connections are checked in after each req...Joshua Peek2009-02-241-7/+0
| * Template without a known template handler should only be reachable through it...thedarkone2009-02-242-8/+25
| * correctly handle layouts for AJAX requests and regular js files [#2052 state:...Matt Jones2009-02-244-14/+24
| * Merge with docrailsPratik Naik2009-02-243-8/+46
* | Minor spelling fixNiels Ganser2009-03-061-1/+1
* | Merge commit 'mainstream/master'Pratik Naik2009-02-2219-184/+331
|\|
| * Don't depend on project.developers orderingJeremy Kemper2009-02-211-2/+2
| * Expected cookie value should also be escaped.moro2009-02-211-1/+1
| * Fix requirements regexp for path segmentsAndrew White2009-02-222-16/+36
| * Remove hardcoded number_of_capturesin ControllerSegment to allow regexp requi...Andrew White2009-02-222-4/+9
| * fix test data, should specify encoding to use multibyte chars on Ruby 1.9moro2009-02-201-0/+1
| * make action_controller/layouts pick templates from the current instance's vie...Sven Fuchs2009-02-203-32/+40
| * Move development mode reloading up the stack to avoid issues with class reloa...Joshua Peek2009-02-204-19/+50
| * Lazy evaluate middleware arguments [#2028 state:resolved]Sven Fuchs2009-02-203-3/+16
| * Lazy evaluate ActionController session store middleware class to pickup custo...Joshua Peek2009-02-193-12/+14
| * Fix templates reloading in development when using custom view path [#2012 sta...Joshua Peek2009-02-195-96/+163
* | Merge commit 'mainstream/master'Pratik Naik2009-02-19102-619/+5756
|\|
| * Special case in deprecated CGI proxy layer for Mongrel CGI cookies [#1957 sta...Joshua Peek2009-02-161-0/+5