Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-14 | 20 | -76/+217 |
|\ | |||||
| * | Revert 5b7527ca "Failing test for routes with member & requirement" [#2054 ↵ | Joshua Peek | 2009-03-13 | 2 | -14/+1 |
| | | | | | | | | state:wontfix] | ||||
| * | Update rack to fix multipart uploads with an empty file [#1945 state:resolved] | Joshua Peek | 2009-03-13 | 14 | -43/+99 |
| | | |||||
| * | 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 | 2 | -2/+90 |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-12 | 27 | -87/+256 |
|\| | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/text_helper.rb activesupport/lib/active_support/inflector.rb | ||||
| * | Support MD5 passwords for Digest auth and use session_options[:secret] in ↵ | Donald Parish | 2009-03-12 | 2 | -28/+97 |
| | | | | | | | | | | | | nonce [#2209 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Update bundled Rack to fix Litespeed compatibility [#2198 state:resolved] | Russ Smith | 2009-03-11 | 7 | -10/+25 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Ensure correct content type is declared after cache hits on actions with ↵ | Mislav Marohnić | 2009-03-10 | 2 | -17/+24 |
| | | | | | | | | | | | | string cache keys [#1585 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | 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 |
| | | |||||
| * | remove rack gem dependency | Joshua Peek | 2009-03-10 | 1 | -1/+0 |
| | | |||||
| * | Add a missing CHANGELOG entry | Pratik Naik | 2009-03-10 | 1 | -0/+2 |
| | | |||||
| * | Ensure auto_link doesnt linkify URLs in the middle of a tag [#1523 ↵ | Eugene Pimenov | 2009-03-10 | 2 | -2/+9 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | reset_session should force a new session id to be generated [#2173] | Joshua Peek | 2009-03-09 | 3 | -16/+50 |
| | | |||||
* | | Fix some typos, including a global "seperator" -> "separator". | Henrik N | 2009-03-12 | 3 | -4/+4 |
| | | |||||
* | | Revert "Updated actionpack/CHANGELOG to include enhancements to form option ↵ | Pratik Naik | 2009-03-10 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | helpers" No CHANGELOG entries please. This reverts commit 7fa0a8d7f38a42d2f41a3f4aefc129d7071b0258. | ||||
* | | Merge branch 'master' of git://github.com/lifo/docrails | Tekin Suleyman | 2009-03-10 | 49 | -219/+661 |
|\ \ | |||||
| * | | Merge commit 'mainstream/master' | Pratik Naik | 2009-03-10 | 49 | -219/+661 |
| |\| | | | | | | | | | | | | | | | | | | | Conflicts: railties/guides/files/stylesheets/main.css railties/guides/rails_guides/generator.rb railties/guides/source/index.erb.textile | ||||
| | * | Ensure blank path_prefix works as expected [#2122 state:resolved] | Andrew Bloom | 2009-03-09 | 2 | -3/+34 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Fixed number_to_phone to work with 7 digit numbers [#2176 state:resolved] | rpheath | 2009-03-09 | 2 | -1/+4 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Prototype helpers support the onCreate callback. | Jeremy Kemper | 2009-03-08 | 1 | -1/+1 |
| | | | | | | | | | | | | [#1074 state:committed] | ||||
| | * | Ruby 1.9 compat: rename deprecated assert_raises to assert_raise. | Jeremy Kemper | 2009-03-08 | 13 | -90/+90 |
| | | | | | | | | | | | | [#1617 state:resolved] | ||||
| | * | Remove duplicate test [#2136 state:resolved] | Yury Kotlyarov | 2009-03-08 | 1 | -5/+0 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Support OPTIONS verb in route conditions [#1727 state:resolved] | Mike Gunderloy | 2009-03-08 | 2 | -1/+9 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Ensure shallow routes respects namespace [#1356 state:resolved] | Tom Stuart | 2009-03-07 | 2 | -5/+33 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Fixed simplified render with nested models [#2042 state:resolved] | Joshua Peek | 2009-03-07 | 5 | -0/+34 |
| | | | |||||
| | * | fix HTML fallback for explicit templates [#2052 state:resolved] | Matt Jones | 2009-03-07 | 3 | -5/+22 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | submit_tag with confirmation and disable_with [#660 state:resolved] | Lawrence Pit | 2009-03-07 | 2 | -4/+11 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Ensure Active Record error related view helpers escape the message [#1280 ↵ | Dan Barry | 2009-03-07 | 2 | -2/+36 |
| | | | | | | | | | | | | | | | | | | state:resolved] [Inge Jørgensen, Dan Barry] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Ensure assert_select works with XML namespaced attributes [#1547 ↵ | Pratik Naik | 2009-03-07 | 2 | -1/+6 |
| | | | | | | | | | | | | state:resolved] [Jon Yurek] | ||||
| | * | 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 ↵ | Johan Sørensen | 2009-03-07 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | private. [#2095 state:resolved] This fixes a regression introduced in f2a32bd0, which wasn't exposed due to two test methods having the same name. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Fix layouts with absolute paths [#2134 state:resolved] | thedarkone | 2009-03-05 | 2 | -2/+11 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Failing test for routes with member & requirement [#2054 state:resolved] | Mike Gunderloy | 2009-03-05 | 2 | -1/+14 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Fixed that redirection would just log the options, not the final url (which ↵ | David Heinemeier Hansson | 2009-03-05 | 2 | -1/+3 |
| | | | | | | | | | | | | lead to "Redirected to #<Post:0x23150b8>") [DHH] | ||||
| | * | Release RC2 today | David Heinemeier Hansson | 2009-03-05 | 1 | -1/+1 |
| | | | |||||
| | * | Generating routes with optional format segment does not inherit params ↵ | Joshua Peek | 2009-03-04 | 2 | -1/+21 |
| | | | | | | | | | | | | format [#2043 state:resolved] | ||||
| | * | Allow routes with a trailing slash to be recognized | Mike Gunderloy | 2009-03-04 | 2 | -3/+11 |
| | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2039 state:committed] | ||||
| | * | Fixed reset_session for ActiveRecord session store [#2108 state:resolved] | Joshua Peek | 2009-03-03 | 1 | -0/+21 |
| | | | |||||
| | * | Use Array.wrap() instead of Array() and handle ↵ | Pratik Naik | 2009-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | action_view.cache_template_loading being false | ||||
| | * | Ensure the old behaviour is retained when action_view.cache_template_loading ↵ | Pratik Naik | 2009-02-28 | 1 | -3/+3 |
| | | | | | | | | | | | | is not set explicitly | ||||
| | * | Fix spelling in test name. | Mike Gunderloy | 2009-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| | * | Added ability to pass in :public => true to fresh_when, stale?, and ↵ | Gregg Pollack | 2009-02-28 | 3 | -7/+109 |
| | | | | | | | | | | | | | | | | | | expires_in to make the request proxy cachable [#2095 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| | * | So it didnt happen yesterday, but very soon! Just need the final details ↵ | David Heinemeier Hansson | 2009-02-28 | 1 | -1/+1 |
| | | | | | | | | | | | | ironed out | ||||
| | * | Prep for RC2 later today | David Heinemeier Hansson | 2009-02-27 | 3 | -3/+3 |
| | | | |||||
| | * | Force all internal calls to Array#to_sentence to use English [#2010 ↵ | David Heinemeier Hansson | 2009-02-27 | 2 | -3/+3 |
| | | | | | | | | | | | | state:resolved] | ||||
| | * | Pass a custom form builder on to nested fields_for calls. [#2023 ↵ | Eloy Duran | 2009-02-27 | 3 | -49/+126 |
| | | | | | | | | | | | | | | | | | | status:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| | * | Ruby 1.9 compat: silence a warning about regexp languages | Sam Granieri | 2009-02-25 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | | | | [#2050 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> |