aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Expand)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-07-049-26/+70
|\
| * Reduce the number of callsites for new TemplateFilesJoshua Peek2008-07-031-2/+3
| * Move template_format logic out to the request so it's alongside the 'regular'...Michael Koziarski2008-07-031-0/+13
| * Remove unneeded ObjectWrapper class.Michael Koziarski2008-07-031-1/+1
| * Use :namespace instead of :path_prefix for finding controller. [#544 state:re...Tarmo Tänav2008-07-031-2/+1
| * Deprecate :use_full_path render option. The supplying the option no longer ha...Joshua Peek2008-07-021-5/+5
| * Added application/jsonrequest as a synonym for application/jsonMike Subelsky2008-07-021-1/+2
| * Add :as option to render a collection of partials with a custom local variabl...Pratik Naik2008-07-021-1/+4
| * Make sure render :template works with :locals. [#524 state:resolved]Tim Haines2008-07-021-1/+4
| * Improved test coverage and added RackRequest support for CGI environment vari...Joshua Peek2008-07-011-5/+30
| * Hide InlineTemplate class from ActionController and use ActionView's render APIJoshua Peek2008-06-251-2/+1
| * Made ActionView::Base#render_file privateJoshua Peek2008-06-255-7/+7
* | teeny tiny change that fixes a minor formating problem'Chris O'Sullivan2008-06-261-4/+2
* | Merge commit 'mainstream/master'Pratik Naik2008-06-2518-133/+165
|\|
| * Patched HTML::Document#initialize call to Node.parse so that it includes the ...Jimmy Baker2008-06-241-1/+1
| * Improve readabilityJeremy Kemper2008-06-241-8/+10
| * Fixed polymorphic_url to be able to handle singleton resources.Tammer Saleh2008-06-221-12/+25
| * fix mergerick2008-06-1910-48/+71
| |\
| | * Replaced TemplateFinder abstraction with ViewLoadPathsJoshua Peek2008-06-173-16/+12
| | * Fix url_for with no arguments when default_url_options is not explicitly defi...Luke Redpath2008-06-171-2/+2
| | * verify :redirect_to => :back should redirect to the referrer. [#280 state:res...Amos King2008-06-171-1/+1
| | * Correct code example in dom_id docs. [#437 state:resolved]Andrew Kaspick2008-06-171-2/+2
| | * Performance: integration test benchmarking and profiling. [Jeremy Kemper]Jeremy Kemper2008-06-142-4/+21
| | * Make rescue template xhtml compatible [Sam Ruby] [#415 status:resolved]Pratik Naik2008-06-131-1/+1
| | * Revert "Lazy load cache and session stores"David Heinemeier Hansson2008-06-121-2/+7
| | * Improve ActionCaching's format-handlingJonathan del Strother2008-06-111-12/+29
| | * Make sure cache_template_loading works and don't use to_prepare callbackPratik Naik2008-06-111-4/+1
| | * Ensure view path cache is rebuilt in production mode which was broke by df44df9.Joshua Peek2008-06-101-4/+4
| | * Lazy load cache and session storesPratik Naik2008-06-101-7/+2
| | * Ensure ActionView::TemplateFinder view cache is rebuilt on initialize.Joshua Peek2008-06-081-1/+4
| | * Drop ActionController::Base.allow_concurrency flagJoshua Peek2008-06-081-7/+0
| |/
| * Ensure we have an array to collectJeremy Kemper2008-06-061-1/+1
| * Don't use deprecated String#eachJeremy Kemper2008-06-061-0/+2
| * Move Class::ModelName to Active Support module core_extJeremy Kemper2008-06-061-18/+2
| * Cache RecordIdentifier methods in Class#model_name wrapperJeremy Kemper2008-06-061-11/+34
| * Use CGI::Cookie::parse for request cookies until we officially deprecated CGI.Joshua Peek2008-06-041-38/+4
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-06-031-1/+1
| |\
| | * Fix assert_redirected_to for nested controllers and named routesGabe da Silveira2008-06-041-1/+1
| * | Fixed Request#remote_ip to only raise hell if the HTTP_CLIENT_IP and HTTP_X_F...David Heinemeier Hansson2008-06-031-4/+5
| |/
| * Allow caches_action to accept a layout option [#198 state:resolved]josevalim2008-06-031-3/+17
| * Namespace Inflector, Dependencies, OrderedOptions, and TimeZone under ActiveS...Joshua Peek2008-06-032-2/+2
| * Ensure Rack processor reads CGI output_cookies for the session cookie.Joshua Peek2008-06-022-4/+8
* | note on increasing performance a bit when using restful urlsTomK322008-06-111-0/+4
* | Mass typo and misspelling fix.Evan Farrar2008-06-047-10/+10
* | Merge commit 'mainstream/master'Pratik Naik2008-06-024-9/+351
|\|
| * Added Rack processorEzra Zygmuntowicz2008-06-012-1/+328
| * Ruby 1.8.7 compat: work around broken DelegateClass#respond_to?Jeremy Kemper2008-05-311-0/+6
| * Require ruby-prof 0.6.1 or later. Use resume/pause to omit extraneous machine...Jeremy Kemper2008-05-301-8/+17
| * Merge docrails.Pratik Naik2008-05-2516-100/+99
* | Updated README example to ActionController::TestCase from Test::Unit::TestCas...scottwillson2008-05-281-0/+23