| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-14 | 17 | -67/+131 |
|\ |
|
| * | Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 st... | Joshua Peek | 2009-03-13 | 1 | -6/+1 |
| * | Update rack to fix multipart uploads with an empty file [#1945 state:resolved] | Joshua Peek | 2009-03-13 | 13 | -42/+98 |
| * | Change naming to match 2.2 so life is easier on plugin developers | Jeremy Kemper | 2009-03-12 | 1 | -5/+5 |
| * | Eliminate internal render stack since we only need its head and tail | Jeremy Kemper | 2009-03-12 | 2 | -17/+27 |
| * | Handle irregular plurals in polymorphic_urls [#2212 state:resolved] | Mike Gunderloy | 2009-03-12 | 1 | -2/+5 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-12 | 20 | -63/+139 |
|\| |
|
| * | Support MD5 passwords for Digest auth and use session_options[:secret] in non... | Donald Parish | 2009-03-12 | 1 | -21/+51 |
| * | Update bundled Rack to fix Litespeed compatibility [#2198 state:resolved] | Russ Smith | 2009-03-11 | 7 | -10/+25 |
| * | Ensure correct content type is declared after cache hits on actions with stri... | Mislav Marohnić | 2009-03-10 | 1 | -17/+10 |
| * | check for rack 1.0 gem before falling back to bundled version | Joshua Peek | 2009-03-10 | 1 | -1/+6 |
| * | update bundled version of rack before 2.3 final | Joshua Peek | 2009-03-10 | 10 | -11/+42 |
| * | Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 state:reso... | Eugene Pimenov | 2009-03-10 | 1 | -2/+3 |
| * | reset_session should force a new session id to be generated [#2173] | Joshua Peek | 2009-03-09 | 1 | -0/+1 |
* | | Fix some typos, including a global "seperator" -> "separator". | Henrik N | 2009-03-12 | 3 | -4/+4 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-10 | 19 | -108/+196 |
|\| |
|
| * | Ensure blank path_prefix works as expected [#2122 state:resolved] | Andrew Bloom | 2009-03-09 | 1 | -1/+2 |
| * | Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved] | rpheath | 2009-03-09 | 1 | -1/+3 |
| * | Prototype helpers support the onCreate callback. | Jeremy Kemper | 2009-03-08 | 1 | -1/+1 |
| * | Support OPTIONS verb in route conditions [#1727 state:resolved] | Mike Gunderloy | 2009-03-08 | 1 | -1/+1 |
| * | Ensure shallow routes respects namespace [#1356 state:resolved] | Tom Stuart | 2009-03-07 | 1 | -2/+2 |
| * | Fixed simplified render with nested models [#2042 state:resolved] | Joshua Peek | 2009-03-07 | 1 | -0/+3 |
| * | fix HTML fallback for explicit templates [#2052 state:resolved] | Matt Jones | 2009-03-07 | 1 | -5/+5 |
| * | submit_tag with confirmation and disable_with [#660 state:resolved] | Lawrence Pit | 2009-03-07 | 1 | -2/+2 |
| * | Ensure Active Record error related view helpers escape the message [#1280 sta... | Dan Barry | 2009-03-07 | 1 | -2/+2 |
| * | Ensure assert_select works with XML namespaced attributes [#1547 state:resolv... | Pratik Naik | 2009-03-07 | 1 | -1/+1 |
| * | Remove unused variable [#1451 state:resolved] [Raphaël Valyi] | Pratik Naik | 2009-03-07 | 1 | -1/+0 |
| * | Ensure expires_in without a :public key sets the Cache-Control header to priv... | Johan Sørensen | 2009-03-07 | 1 | -1/+3 |
| * | Fix layouts with absolute paths [#2134 state:resolved] | thedarkone | 2009-03-05 | 1 | -1/+0 |
| * | Failing test for routes with member & requirement [#2054 state:resolved] | Mike Gunderloy | 2009-03-05 | 1 | -1/+6 |
| * | Fixed that redirection would just log the options, not the final url (which l... | David Heinemeier Hansson | 2009-03-05 | 1 | -1/+1 |
| * | Generating routes with optional format segment does not inherit params format... | Joshua Peek | 2009-03-04 | 1 | -1/+5 |
| * | Allow routes with a trailing slash to be recognized | Mike Gunderloy | 2009-03-04 | 1 | -1/+1 |
| * | Use Array.wrap() instead of Array() and handle action_view.cache_template_loa... | Pratik Naik | 2009-02-28 | 1 | -1/+1 |
| * | Ensure the old behaviour is retained when action_view.cache_template_loading ... | Pratik Naik | 2009-02-28 | 1 | -3/+3 |
| * | Added ability to pass in :public => true to fresh_when, stale?, and expires_i... | Gregg Pollack | 2009-02-28 | 1 | -7/+35 |
| * | Prep for RC2 later today | David Heinemeier Hansson | 2009-02-27 | 1 | -1/+1 |
| * | Force all internal calls to Array#to_sentence to use English [#2010 state:res... | David Heinemeier Hansson | 2009-02-27 | 2 | -3/+3 |
| * | Pass a custom form builder on to nested fields_for calls. [#2023 status:commi... | Eloy Duran | 2009-02-27 | 1 | -49/+83 |
| * | Ruby 1.9 compat: silence a warning about regexp languages | Sam Granieri | 2009-02-25 | 1 | -1/+5 |
| * | Ensure ActiveRecord session store's connections are checked in after each req... | Joshua Peek | 2009-02-24 | 1 | -7/+0 |
| * | Template without a known template handler should only be reachable through it... | thedarkone | 2009-02-24 | 1 | -8/+15 |
| * | correctly handle layouts for AJAX requests and regular js files [#2052 state:... | Matt Jones | 2009-02-24 | 2 | -10/+17 |
| * | Merge with docrails | Pratik Naik | 2009-02-24 | 3 | -8/+46 |
* | | Minor spelling fix | Niels Ganser | 2009-03-06 | 1 | -1/+1 |
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-02-22 | 10 | -136/+144 |
|\| |
|
| * | Fix requirements regexp for path segments | Andrew White | 2009-02-22 | 1 | -16/+12 |
| * | Remove hardcoded number_of_capturesin ControllerSegment to allow regexp requi... | Andrew White | 2009-02-22 | 1 | -4/+0 |
| * | make action_controller/layouts pick templates from the current instance's vie... | Sven Fuchs | 2009-02-20 | 1 | -32/+26 |
| * | Move development mode reloading up the stack to avoid issues with class reloa... | Joshua Peek | 2009-02-20 | 3 | -14/+42 |