aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2009-11-1745-3517/+420
|\ | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb
| * Split mime responder into smaller chunks and allow action to be configured.José Valim2009-11-131-17/+27
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Rdoc for changes introduced in e2ed1a1ca, 36058f450.David Vrensk2009-11-121-0/+1
| | | | | | | | | | | | [#3451 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * String#bytesize is not needed for Ruby >= 1.8.7Xavier Noria2009-11-091-2/+0
| |
| * Fix some Ruby warnings: `*' interpreted as argument prefixBryan Helmkamp2009-11-091-2/+2
| |
| * Update AC::Middleware to play better with the normal AC::Metal stack. This ↵Yehuda Katz2009-11-053-24/+24
| | | | | | | | required stopping to use #call for non-rack-related stuff
| * Extracted localized_cache.rb from ActionController, added it to ↵José Valim2009-11-011-38/+3
| | | | | | | | AbstractController and made ActionMailer use it.
| * Add some basic render_test to AbstractController.José Valim2009-11-011-0/+9
| |
| * Improve AbstractController layouts coverage.José Valim2009-11-011-0/+4
| |
| * Move all render and layout pieces required in ActionMailer from ↵José Valim2009-11-012-34/+0
| | | | | | | | ActionController to AbstractController.
| * Remove ActionMailer helpers and rely on AbstractController one.José Valim2009-11-011-65/+4
| |
| * Refactor ActionMailer layout and remove legacy one.José Valim2009-11-012-267/+0
| |
| * Caching refactoringYehuda Katz2009-10-294-86/+91
| |
| * First pass at cleaning up action cachingYehuda Katz2009-10-282-104/+96
| |
| * Make polymorphic_url work with symbols again and refactor it [#1384 ↵José Valim2009-10-281-34/+7
| | | | | | | | | | | | status:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * New semantics eliminate the need for __send__Yehuda Katz2009-10-281-2/+2
| |
| * Reorganize CSRF a bitYehuda Katz2009-10-281-33/+23
| |
| * AS::Notifications.subscribe blocks are now yielded the arguments to pass to ↵Yehuda Katz2009-10-271-1/+3
| | | | | | | | AS::Notifications::Event.new
| * #include should be #extendYehuda Katz2009-10-271-1/+1
| |
| * Clean up flash a bitYehuda Katz2009-10-271-1/+1
| |
| * Clean up flash a bitYehuda Katz2009-10-261-25/+23
| |
| * Clean up parameter logging someYehuda Katz2009-10-261-42/+23
| |
| * Clean up and update cookiesYehuda Katz2009-10-261-17/+27
| |
| * Fixes expires_now and cleans things up a bitYehuda Katz2009-10-261-1/+1
| |
| * Extract #head into its own module and simplify itYehuda Katz2009-10-262-36/+30
| |
| * Base setup for config object in AC.Yehuda Katz2009-10-263-12/+32
| |
| * Start rewriting some internal tests to use the new routing dslJoshua Peek2009-10-201-0/+4
| |
| * Group together all the old routing dsl logicJoshua Peek2009-10-201-1/+0
| |
| * Move Routing into ADJoshua Peek2009-10-206-1765/+3
| |
| * Replace decaying routing internals w/ rack-mountJoshua Peek2009-10-1911-1234/+337
| |
| * Only undef to_json if it's definedJeremy Kemper2009-10-191-1/+1
| |
| * Unify class_inheritable_accessor and extlib_inheritable_accessor and allow ↵José Valim2009-10-171-6/+3
| | | | | | | | responder to be set in the class level.
| * Use Rails.application where we want a valid rack appJoshua Peek2009-10-161-1/+1
| |
| * Deprecate RAILS_ROOT in favor of Rails.root (which proxies to the ↵Carl Lerche2009-10-161-1/+1
| | | | | | | | application's object root)
| * Renamed Orchestra to Notifications once again [#3321 state:resolved]José Valim2009-10-153-8/+8
| |
| * Unify benchmark APIs.José Valim2009-10-152-23/+6
| |
| * Update Orchestra instrumentations and move part of logging to Orchestra.José Valim2009-10-153-27/+15
| |
| * Revert "Rename Orchestra to Notifications [#3321 state:resolved]"José Valim2009-10-152-6/+6
| | | | | | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2.
| * Punt on ConcurrentHash [#3322 state:resolved]Joshua Peek2009-10-141-5/+5
| |
| * Rename Orchestra to Notifications [#3321 state:resolved]Joshua Peek2009-10-142-6/+6
| |
| * Test cases should see all the cookies, not just cookies that have been set ↵Craig Smith2009-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | in the controller. Previously this example would always pass, even when cookies.delete was not called. @request.cookies['foo'] = 'bar' get :delete_cookie assert_nil cookies['foo'] Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2768 state:committed]
| * Use ERB::Util.h over CGI.escapeHTML as the former is safety aware and the ↵Michael Koziarski2009-10-151-1/+1
| | | | | | | | latter isn't
| * CookieJar#delete should return the key's value, consistent with a HashJeffrey Hardy2009-10-141-1/+2
| | | | | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* | Merge commit 'mainstream/master'Pratik Naik2009-10-102-2/+2
|\|
| * Finish porting over the initializers to the app object and fix all the testsCarl Lerche2009-10-081-1/+1
| |
| * Revert "Revert "Fix Dispatch.new so passenger works" as it broke the build"Joshua Peek2009-10-051-1/+1
| | | | | | | | This reverts commit 49b52cadc2e66c11a025e7719837ae77b3736046.
| * Revert "Fix Dispatch.new so passenger works" as it broke the buildMichael Koziarski2009-10-051-1/+1
| | | | | | | | This reverts commit c97c31b096e627480b64403d1460065738941c3e.
| * Fix Dispatch.new so passenger worksJoshua Peek2009-10-041-1/+1
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-09-3011-677/+249
|\|
| * Ported the new ActionView::TestCase from 2-3-stable to master [#3260Erik Ostrom2009-09-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | state:resolved] The test case now mimicks the template environment more closely, so it's possible to use render, load helper dependencies. This also fixes assert_select, and similar assertions. Because view tests and helpers generally don't render full templates assert_select looks first in rendered and then in output_buffer to find the rendered output. Additional `master'-only changes: Made the Action Pack Rakefile run the ActionView::TestCase tests, and made ActionView::Rendering#_render_text always return a string. Signed-off-by: Joshua Peek <josh@joshpeek.com>