aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2009-09-3027-321/+589
|\
| * Initialize a new instance of Rails.application during integration testsCarl Lerche2009-09-301-1/+1
| | | | | | This is to fix the AWDWR tests until the application object is refactored to be a singleton.
| * Ported the new ActionView::TestCase from 2-3-stable to master [#3260Erik Ostrom2009-09-283-26/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Introduce :almost keyword for distance_of_time_in_words. Make 1.75 days - 2 ↵John Trupiano2009-09-282-10/+22
| | | | | | | | | | | | | | days return '2 days'. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3266 state:committed]
| * Enhancing distance_of_time_in_words to prefix year output with over and ↵Jay Pignata2009-09-281-4/+7
| | | | | | | | | | | | | | about depending upon how many months have elapsed Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3106 state:committed]
| * Move middleware and route configuration from AC::Dispatcher to Rails ↵Joshua Peek2009-09-263-12/+6
| | | | | | | | application object
| * Allow setting a default application for all integration testsJoshua Peek2009-09-261-2/+20
| |
| * Allow integration test rack app to be set with "@app" ivar instead of using ↵Joshua Peek2009-09-261-2/+3
| | | | | | | | open_session
| * Move default middleware stack into initializerJoshua Peek2009-09-262-20/+1
| |
| * Move Rails::Static into ActionDispatchJoshua Peek2009-09-262-1/+46
| |
| * Extract "parse_config" into ADJoshua Peek2009-09-252-0/+21
| |
| * Fix generic url rewriter in integration testsJoshua Peek2009-09-251-1/+1
| |
| * Restore split between require-time and runtime load path mungery. Simplifies ↵Jeremy Kemper2009-09-241-1/+1
| | | | | | | | vendor requires.
| * Move railties/lib/* into railties/lib/*Yehuda Katz + Carl Lerche2009-09-241-0/+1
| |
| * Clean up log output for rendered templatesJoshua Peek2009-09-244-67/+87
| |
| * Resurrect AC::Benchmarking [#3140 state:resolved]Joshua Peek2009-09-243-3/+97
| |
| * SessionRestoreError belongs in ADJoshua Peek2009-09-235-13/+12
| |
| * Move helpers specific to functional tests out of TestProcess into AC::TestCaseJoshua Peek2009-09-232-152/+149
| |
| * Move integration test runner into ActionDispatchJoshua Peek2009-09-236-9/+20
| |
| * Fixes Sam Ruby tests suite.José Valim2009-09-211-6/+1
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
* | Merge commit 'mainstream/master'Pratik Naik2009-09-2136-763/+374
|\|
| * Use NewCallbacks on ActionDispatch::Callbacks.José Valim2009-09-203-25/+41
| |
| * Add Orchestra instrumentation to fragment and page caching.José Valim2009-09-206-66/+57
| |
| * Instrument process_action, render and sql.José Valim2009-09-202-6/+11
| |
| * 1.9 fix for changes to #to_s. By Sam Ruby. [#3228 state:resolved]Yehuda Katz2009-09-181-2/+2
| |
| * Forward all methods to delayed logJoshua Peek2009-09-161-6/+8
| |
| * Remove unused code in ActionView.José Valim2009-09-154-133/+0
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Beef up AD::Rescue to replace global exception handling lost in ↵Joshua Peek2009-09-151-4/+16
| | | | | | | | ApplicationController
| * Remove global exception catching from ApplicationController.Joshua Peek2009-09-152-48/+7
| | | | | | It was severely broken since it was ported to NewBase and is causing problems with normal exception catching. A replacement is coming soon.
| * Require active_support after autoload setupJeremy Kemper2009-09-142-9/+9
| |
| * Uses extlib_inheritable_accessorJeremy Kemper2009-09-141-0/+2
| |
| * Rollback AS bundler work and improve activation of vendored dependenciesJoshua Peek2009-09-131-1/+1
| |
| * AV::UrlHelper depends on Array#secondJoshua Peek2009-09-131-0/+1
| |
| * Omit PATH_INFO in integration test so rack mock will properly override itJoshua Peek2009-09-131-1/+0
| |
| * Lazy require memcache for session middlewareJoshua Peek2009-09-131-40/+35
| |
| * Don't force test suite to use bundlerJoshua Peek2009-09-131-0/+1
| |
| * Merge commit 'alloy/master-nested_attributes_and_autosave'Michael Koziarski2009-09-131-7/+19
| |\
| | * Allow fields_for on a nested_attributes association to accept an explicit ↵Andrew France2009-09-121-7/+19
| | | | | | | | | | | | | | | | | | collection to be used. [#2648 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
| * | Memoize in the endpoint.Yehuda Katz2009-09-121-5/+10
| | |
| * | Add per-controller middlewareYehuda Katz2009-09-121-1/+14
| |/
| * Revert "Allow frameworks to be required by their gem name"Jeremy Kemper2009-09-121-1/+0
| | | | | | | | | | | | | | This has just been confusing. Better to educate than band-aid. This reverts commit 18a24274ec823ded4ffa29bf33fd3d76816aab7e. Originally from http://dev.rubyonrails.org/ticket/8845 [drnic]
| * Fix filtering parameters when there are Fixnum or other un-dupable values.Nathaniel Talbott2009-09-101-1/+1
| | | | | | | | | | | | [#3184 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fix callbacks on ActionPack.José Valim2009-09-081-1/+1
| | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com>
| * Cleanup hacky routing with controller_path in url helper tests. This doesn't ↵Joshua Peek2009-09-061-1/+1
| | | | | | | | work in real life anyway.
| * Clean tag attributes before passing through the escape_once logic.Michael Koziarski2009-09-041-1/+1
| | | | | | | | Addresses CVE-2009-3009
| * CookieStore should not be derived from Hash - reverting [#2268 state:resolved]Jay Pignata2009-09-031-1/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Replace :formats => ["*/*"] with the default formats setYehuda Katz + Carl Lerche2009-09-031-0/+2
| |
| * Refactor ActionController to use find_template and template_exists?Yehuda Katz + Carl Lerche2009-09-034-8/+12
| |
| * Don't raise exceptions for missing javascript_include_tag or ↵Sam Pohlenz2009-09-031-2/+6
| | | | | | | | | | | | stylesheet_link_tag sources unless the :cache or :concat options are given. [#2738 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Refactor ActionView::ResolverYehuda Katz + Carl Lerche2009-09-033-78/+97
| |
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-04 02:30:03 +0000