Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Revert "A small addition to the fragment caching documentation" | Pratik Naik | 2009-02-01 | 1 | -7/+0 |
| | | | | | | This reverts commit 37fac27cd9bbd1a0e0a0325a87bbfa70cc7baa47. REASON : Needs to be reworded and put in the documentation of cache() method | ||||
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-02-01 | 16 | -91/+513 |
|\ | |||||
| * | Use Rack::Head middleware to ensure the body is discarded for HEAD requests | Joshua Peek | 2009-02-01 | 3 | -0/+18 |
| | | |||||
| * | Remove ancient tests for CGI parsing bug | Joshua Peek | 2009-01-31 | 1 | -30/+0 |
| | | |||||
| * | Removed Prototype specific Safari 2 AJAX hack. | Joshua Peek | 2009-01-31 | 2 | -7/+0 |
| | | | | | | | | The normal null character stripper is still there. | ||||
| * | Removed map.resources :only/:except inheritance | Tarmo Tänav | 2009-02-01 | 2 | -31/+47 |
| | | | | | | | | | | | | | | | | | | | | It's very rare for these options to apply identically to nested child resources, and with this inheritance on it's very difficult to have a child resource with more actions than the parent. This reverts commit 2ecec6052f7f290252a9fd9cc27ec804c7aad36c. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1826 state:committed] | ||||
| * | Add support for nested object forms to ActiveRecord and the helpers in ↵ | Eloy Duran | 2009-02-01 | 3 | -14/+335 |
| | | | | | | | | | | | | | | | | ActionPack Signed-Off-By: Michael Koziarski <michael@koziarski.com> [#1202 state:committed] | ||||
| * | Ruby 1.9 compat: omit Rack::Lint from integration tests until it accepts ↵ | Jeremy Kemper | 2009-01-31 | 1 | -1/+5 |
| | | | | | | | | String headers and bodies | ||||
| * | Fix unsorted array comparison | Jeremy Kemper | 2009-01-31 | 2 | -2/+2 |
| | | |||||
| * | Ruby 1.9 compat: work around that String is not Enumerable | Jeremy Kemper | 2009-01-31 | 2 | -2/+6 |
| | | |||||
| * | Controller, response, and request should all refer to same session, even ↵ | Scott Taylor | 2009-01-29 | 2 | -4/+42 |
| | | | | | | | | | | | | after a call to session_reset [#1823 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Deprecation tests for f17c876 [#1801 state:resolved] | Mike Gaffney | 2009-01-29 | 1 | -0/+58 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-29 | 41 | -251/+900 |
|\| | |||||
| * | Digest#validate_digest_response should accept request instead of controller | Pratik Naik | 2009-01-29 | 1 | -6/+6 |
| | | |||||
| * | Added grouped_options_for_select helper method for wrapping option tags in ↵ | Jon Crawford | 2009-01-29 | 3 | -0/+84 |
| | | | | | | | | | | | | optgroups. [#977 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Implement HTTP Digest authentication. [#1230 state:resolved] [Gregg Kellogg, ↵ | Gregg Kellogg | 2009-01-29 | 4 | -25/+326 |
| | | | | | | | | | | | | Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Move basic auth test controller inside the test class | Pratik Naik | 2009-01-29 | 1 | -21/+21 |
| | | |||||
| * | Using the highlight helper on text with html shouldn't highlight text inside ↵ | Dan Weinand | 2009-01-28 | 2 | -1/+24 |
| | | | | | | | | | | | | html attributes. [#1302 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure selected option is not ignored for collection_select. [#1037 ↵ | Daniel Rodríguez Troitiño | 2009-01-28 | 2 | -1/+18 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Ensure that when UrlWriter is included in multiple classes, the ↵ | Nathan de Vries | 2009-01-28 | 2 | -7/+19 |
| | | | | | | | | | | | | default_url_options of one don't affect the other. [#1277 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | Session cookie header should always be set if :expire_after option is specified | Pratik Naik | 2009-01-28 | 3 | -8/+40 |
| | | |||||
| * | Use toplevel reference to ::StringIO since we're in a BasicObject. | Jeremy Kemper | 2009-01-27 | 1 | -2/+2 |
| | | |||||
| * | Fix for sweepers method_missing missing &block argument [#1581 status:committed] | Tys von Gaza | 2009-01-27 | 1 | -2/+2 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Restore implicit rendering for XHR requests that want a HTML template [#1590 ↵ | Joshua Peek | 2009-01-27 | 3 | -0/+12 |
| | | | | | | | | state:resolved] | ||||
| * | Fixed deprecated methods on TestSession [#1801 state:resolved] | Joshua Peek | 2009-01-27 | 2 | -17/+21 |
| | | |||||
| * | Dont use Memoizable for ActionController::Request | Pratik Naik | 2009-01-27 | 4 | -76/+65 |
| | | |||||
| * | Improve i18n support for number_to_human_size helper: | Yaroslav Markin | 2009-01-27 | 4 | -23/+72 |
| | | | | | | | | | | | | | | | | | | | | | | | | * now using pluralization properly * storage unit translations moved to number.human.storage_units.units * introduced number.human.storage_units.format for languages that do not follow "{{number}} {{unit}}" format (Japanese) NOTE: I18n table changed, you will need to update your translations. [#1634 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Ensure the full path is used when searching for layouts [#1803 state:resolved] | Joshua Peek | 2009-01-27 | 1 | -1/+1 |
| | | |||||
| * | Fix for failing ActionMailer multipart tests | Joshua Peek | 2009-01-26 | 1 | -2/+2 |
| | | |||||
| * | Add localized templates | Joshua Peek | 2009-01-25 | 5 | -15/+67 |
| | | | | | | | | | | | | | | | | # Default locale app/views/messages/index.html.erb # I18n.locale is set to :da (Danish) app/views/messages/index.da.html.erb | ||||
| * | Remove the irrelevant fixture added in fe6ffce51dc16285094be49244b26591956c2dd6 | Pratik Naik | 2009-01-24 | 1 | -8/+0 |
| | | |||||
| * | Make sure inner scope conditions get a preference over the outer ones | Pratik Naik | 2009-01-24 | 1 | -1/+9 |
| | | |||||
| * | Setup ActiveRecord QueryCache middleware in the initializer | Joshua Peek | 2009-01-21 | 1 | -5/+3 |
| | | |||||
| * | Missed RequestParser in ff0a267 | Joshua Peek | 2009-01-21 | 1 | -1/+0 |
| | | |||||
| * | Allow empty files to be uploaded | Joshua Peek | 2009-01-20 | 4 | -4/+22 |
| | | |||||
| * | Add MiddlewareStack#swap | Joshua Peek | 2009-01-20 | 2 | -5/+16 |
| | | | | | | | | config.middleware.swap ActionController::Session::CookieStore, MySessionStore | ||||
| * | Don't let empty Tempfiles come through as uploaded files [#1785 state:resolved] | Mislav Marohnić | 2009-01-20 | 3 | -1/+17 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Restore cookie store httponly default to true. Remove extraneous dup of ↵ | Cody Fauser | 2009-01-20 | 2 | -5/+3 |
| | | | | | | | | | | | | options on initialization [#1784 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Deprecate ActionController::Base#session_enabled? | Pratik Naik | 2009-01-19 | 1 | -1/+1 |
| | | |||||
| * | Improve HTTP Basic authentication tests | Pratik Naik | 2009-01-18 | 2 | -54/+88 |
| | | |||||
| * | Merge docrails | Pratik Naik | 2009-01-18 | 6 | -72/+106 |
| | | |||||
* | | A small addition to the fragment caching documentation | Dimitri Krassovski | 2009-01-26 | 1 | -0/+7 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-01-18 | 25 | -590/+350 |
|\| | |||||
| * | Bump up the year in MIT license files | Pratik Naik | 2009-01-18 | 4 | -4/+4 |
| | | |||||
| * | Remove script/performance/profiler in favour of performance integration tests. | Pratik Naik | 2009-01-18 | 1 | -168/+0 |
| | | | | | | | | | | | | To continue using script/performance/profiler, install the request_profiler plugin : script/plugin install git://github.com/rails/request_profiler.git | ||||
| * | Build query string and POST params parser on top of Rack::Request. Also ↵ | Joshua Peek | 2009-01-17 | 12 | -333/+190 |
| | | | | | | | | switch our multipart parser to use Racks. Moved XML, JSON, and YAML parsers into ActionController::ParamsParser middleware [#1661 state:resolved] | ||||
| * | Add test coverage for fixing Safari 2 trailing null character | Joshua Peek | 2009-01-17 | 1 | -0/+12 |
| | | |||||
| * | Ensure any method sent to RewindableIO reads the original IO object [#1767 ↵ | Joshua Peek | 2009-01-17 | 2 | -25/+9 |
| | | | | | | | | state:resolved] | ||||
| * | Lock middleware has been committed upstream | Joshua Peek | 2009-01-17 | 6 | -40/+46 |
| | | |||||
| * | Fix performance regression | Jeremy Kemper | 2009-01-16 | 2 | -2/+6 |
| | |