aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
...
| * fix two MimeType failing test casesrick2008-11-131-1/+4
| | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Changed request forgery protection to only worry about HTML-formatted ↵Jeff Cohen2008-11-133-3/+4
| | | | | | | | | | | | content requests. Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * Add :only/:except options to map.resourcesTom Stuart2008-11-121-37/+85
| | | | | | | | | | | | | | This allows people with huge numbers of resource routes to cut down on the memory consumption caused by the generated code. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1215 state:committed]
* | Merge branch 'master' into testingJeremy Kemper2008-11-114-34/+53
|\|
| * Eliminate excess Regexp creation due to capture countingJeremy Kemper2008-11-102-4/+26
| |
| * Pare down object creation during route buildingJeremy Kemper2008-11-102-30/+27
| |
* | Merge branch 'master' into testingJeremy Kemper2008-11-071-1/+0
|\|
| * Simplify dispatcher callbacks to eliminate unnecessary stale thread purging. ↵Nick Sieger2008-11-081-1/+0
| | | | | | | | | | | | [Nick Sieger, Pratik Naik] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | Move controller assertions from base TestCase to AC:: and AV::TestCaseJeremy Kemper2008-11-073-36/+31
| |
* | Remove controller assertions from Test::Unit::TestCase. Use ↵Jeremy Kemper2008-11-073-71/+58
|/ | | | ActionController::TestCase.
* Don't eval recognize_optimized use __FILE__ and __LINE__ in the optimised ↵Aliaksey Kandratsenka2008-11-061-1/+1
| | | | | | | | | recognition code. It produces meaningless line numbers. This also easily produces line numbers greater than recognition_optimization.rb have, which causes rcov to trash memory outside of it's coverage counting arrays. [#1319 state:committed] Signed-off-by: Michael Koziarski <michael@koziarski.com>
* Fix stupid typoMichael Koziarski2008-11-061-1/+1
|
* Fixed the sanitize helper to avoid double escaping already properly escaped ↵David Heinemeier Hansson2008-11-061-1/+1
| | | | entities [#683 state:committed]
* Dont bother logging the parameters hash if there are no parametersDavid Heinemeier Hansson2008-11-061-1/+1
|
* Dont log the _method attribute either. Its already available in the headerDavid Heinemeier Hansson2008-11-043-21/+25
|\
| * Remove unused debug_routesPratik Naik2008-11-021-6/+0
| |
| * Dont dup params twice when filter_parameters is presentPratik Naik2008-11-021-2/+2
| |
| * Dont document internalsPratik Naik2008-11-021-3/+0
| |
| * Backwards compatibility fixes for relative_url_rootMichael Koziarski2008-11-022-6/+4
| | | | | | | | | | * Make the old deprecated relative_url_root still set the value as it's still used by mongrel * Set the default from the ENV value when the file is required, not at runtime.
| * Merge with docrailsPratik Naik2008-11-021-0/+3
| |
| * Cleaned up route optimisation guard condition generation code as it was ↵Tom Lea2008-11-011-7/+19
| | | | | | | | | | | | | | | | getting a little messy. Add additional condition to handle the case where default_url_options is only defined in the controller, not the view. Signed-off-by: Michael Koziarski <michael@koziarski.com>
* | Dont log the _method attribute either. Its already available in the headerDavid Heinemeier Hansson2008-11-041-2/+2
|/
* Simplified the logging format for parameters (don't include controller, ↵David Heinemeier Hansson2008-11-011-6/+23
| | | | action, and format as duplicates) [DHH]
* Make sure habtm use class variable to list association valid keysLuca Guidi2008-11-011-1/+2
| | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1310 state:committed]
* Remove the logging of the Session ID when the session store is CookieStore [DHH]David Heinemeier Hansson2008-11-011-1/+5
|
* Accidently nixed a doc headerDavid Heinemeier Hansson2008-11-011-0/+1
|
* Added render :js for people who want to render inline JavaScript replies ↵David Heinemeier Hansson2008-11-011-1/+23
| | | | without using RJS [DHH]
* Ensure content type gets reset after render_to_string [#1182 state:resolved]Joshua Peek2008-10-301-0/+1
|
* Fixed regex in redirect_to to fully support URI schemes [#1247 state:committed]Seth Fitzsimmons2008-10-301-1/+4
| | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
* Proper API for reloading translationsDavid Heinemeier Hansson2008-10-291-0/+4
|
* Track rendered templates in stack so the current template can always be ↵Joshua Peek2008-10-281-1/+1
| | | | accessed. Added ActionView::Base#template to access the template object.
* Thread Safety: Ensure recognize_optimized is immediately written instead of ↵Joshua Peek2008-10-271-7/+1
| | | | lazily
* Fix incorrect closing CDATA delimiter. Add tests for CDATA nodes.Jeffrey Hardy2008-10-231-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Fix that HTML::Node.parse would blow up on unclosed CDATA sections.Jeffrey Hardy2008-10-231-1/+8
| | | | | | | | If an unclosed CDATA section is encountered and parsing is strict, an exception will be raised. Otherwise, we consider the remainder of the line to be the section contents. This is consistent with HTML::Tokenizer#scan_tag. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* Dont try to auto-set the etag based on the body if any freshness headers ↵David Heinemeier Hansson2008-10-212-12/+27
| | | | have already been set [DHH/José Valim]
* Remove stuff that was deprecated in 2-1-stablePratik Naik2008-10-211-26/+0
|
* No use case handy for justifying fresh? any moreDavid Heinemeier Hansson2008-10-211-5/+0
|
* Let fresh_when actually do the head(:not_modified). Cleaner and we get the ↵David Heinemeier Hansson2008-10-211-10/+8
| | | | filter halting for free then.
* Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-10-211-1/+2
|\
| * Ensure ActionView::Helpers::AssetTagHelper::AssetTag::Cache is cleared ↵Tim Harper2008-10-201-1/+2
| | | | | | | | | | | | before loading so changes to asset files are picked up by the broswer [#1233 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
* | Added stale?/fresh? and fresh_when methods to provide a layer of abstraction ↵David Heinemeier Hansson2008-10-212-19/+65
|/ | | | above request.fresh? and friends [DHH]
* Sanitize the URLs passed to redirect_to to prevent a potential response ↵Michael Koziarski2008-10-191-2/+2
| | | | | | splitting attack. CGI.rb and mongrel don't do any sanitization of the contents of HTTP headers, so care needs to be taken.
* Make sure named routes with parameters can be used in tests before a request ↵Eloy Duran2008-10-131-0/+3
| | | | | | has been done. [#1208 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Allow use of :path_prefix and :name_prefix outside of namespaced routes. ↵Tom Stuart2008-10-081-3/+1
| | | | | | [#1188 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Make sure last_modified! works with <= rather than just equality.Michael Koziarski2008-10-071-1/+3
|
* Merge docrailsPratik Naik2008-10-051-4/+12
|
* Add tests for ActiveSupport::Rescuable. Use ActiveSupport::Rescuable in ↵Pratik Naik2008-10-041-99/+3
| | | | ActionController::Base.
* Ensure rescue_from handlers are respected inside tests. [#835 state:resolved]Pratik Naik2008-10-042-19/+19
| | | | | | Note : If you're not using rescue_from, you should overrider rescue_action_without_handler() method and not rescue_action(). Afterwards, you can set request.remote_addr to a non "0.0.0.0" value for testing the overridden behavior.
* Return processing lock to dispatcher, the finer grained lock was ↵Aliaksey Kandratsenka2008-10-042-9/+14
| | | | | | | | | | incompatible with the reloading in development mode. This commit also adds ActionController::Dispatcher#dispatch_unlocking -- non-locking version of dispatch. It's named anologously to POSIX {getc,getchar,...}_unlocked functions. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1170 state:committed]
* call clear_active_connections! in :after_dispatch to give pooled connections ↵Aliaksey Kandratsenka2008-10-042-1/+17
| | | | | | | | | | | back This fixes connection pool exhaustion for web servers which create new thread per connection (e.g. Webrick). integration.rb changes are required to keep test transaction active for several requests. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1171 state:committed]