aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fixed an example that was missing a colon for a hash-key.Ben Orenstein2009-10-301-1/+1
|
* Merge commit 'mainstream/master'Pratik Naik2009-10-1089-457/+748
|\
| * Fix a bug where render :text could not handle yield :symbol. Fixes guides ↵Yehuda Katz2009-10-101-9/+13
| | | | | | | | generation
| * Fix issue with standalone ActionViewYehuda Katz2009-10-091-1/+4
| |
| * Avoid super in define_method for RubiniusYehuda Katz2009-10-091-1/+6
| |
| * Get rid of constant name usage for stack trace help in favor of overriding ↵Yehuda Katz2009-10-091-9/+9
| | | | | | | | #inspect and .name.
| * Finish porting over the initializers to the app object and fix all the testsCarl Lerche2009-10-082-3/+6
| |
| * API change: content_tag_for outputs prefixed class nameJoshua Peek2009-10-082-4/+4
| |
| * Fix warning spew for 1.9Carl Lerche2009-10-081-1/+5
| |
| * error procs have to be safe tooMichael Koziarski2009-10-081-1/+1
| |
| * Switch to on-by-default XSS escaping for rails.Michael Koziarski2009-10-0833-41/+237
| | | | | | | | | | | | | | | | | | | | | | | | This consists of: * String#html_safe! a method to mark a string as 'safe' * ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it * Calls to String#html_safe! throughout the rails helpers * a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB) * New ERB implementation based on erubis which uses a SafeBuffer instead of a String Hat tip to Django for the inspiration.
| * Not calling a private method anymoreYehuda Katz2009-10-071-2/+5
| |
| * Fix warning spewYehuda Katz2009-10-061-1/+3
| |
| * Coerce all out going body parts to StringsJoshua Peek2009-10-054-0/+71
| |
| * 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
| |
| * Only draw default route onceJoshua Peek2009-10-031-22/+37
| |
| * Use with_routing helper in tests instead of modifying global route setJoshua Peek2009-10-034-101/+125
| |
| * Redraw default routes on all internal integration tests. We don't need ↵Joshua Peek2009-10-0315-41/+34
| | | | | | | | SimpleRouteCase anymore
| * Avoid creating new controller constants during test runtime. All routable ↵Joshua Peek2009-10-032-68/+21
| | | | | | | | controllers should be defined beforehand.
| * Moved shared form helper models into fake_modelsJoshua Peek2009-10-033-99/+98
| |
| * NumberHelper depends on big decimal extensionsJoshua Peek2009-10-031-0/+1
| |
| * Changing directories during the test breaks file loading when ran by itselfJoshua Peek2009-10-032-32/+22
| |
| * Don't load rubygems for isolated testsJoshua Peek2009-10-031-2/+3
| |
| * Move improved isolated test runner to APJoshua Peek2009-10-032-6/+21
| |
| * File extra test folders into controller, dispatch, or templateJoshua Peek2009-10-0326-18/+17
| |
| * Add custom "with_routing" to internal tests to fix reseting session after usingJoshua Peek2009-10-0314-20/+30
| | | | | | | | with_routing. This only affects our internal AP tests.
* | Merge commit 'mainstream/master'Pratik Naik2009-09-3053-562/+937
|\|
| * 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-288-38/+278
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-284-31/+59
| | | | | | | | | | | | | | 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-282-11/+15
| | | | | | | | | | | | | | 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-264-19/+11
| | | | | | | | application object
| * Allow setting a default application for all integration testsJoshua Peek2009-09-263-9/+28
| |
| * Allow integration test rack app to be set with "@app" ivar instead of using ↵Joshua Peek2009-09-268-27/+22
| | | | | | | | open_session
| * Fix skipping memcache tests if a memcache server isn't runningJoshua Peek2009-09-261-0/+4
| |
| * Remove deprecated calls to Dispatcher.to_prepareJoshua Peek2009-09-261-10/+5
| |
| * Move default middleware stack into initializerJoshua Peek2009-09-265-33/+8
| |
| * AC::Dispatcher is the default app, don't need to set itJoshua Peek2009-09-261-4/+0
| |
| * Clean up session integration tests so they don't reference AC::DispatcherJoshua Peek2009-09-263-52/+15
| |
| * Move Rails::Static into ActionDispatchJoshua Peek2009-09-266-1/+84
| |
| * Extract "parse_config" into ADJoshua Peek2009-09-252-0/+21
| |
| * Fix generic url rewriter in integration testsJoshua Peek2009-09-252-1/+10
| |
| * Make gemspecs the authoritative source instead of generating them from the ↵Joshua Peek2009-09-252-75/+21
| | | | | | | | Rakefile
| * Restore split between require-time and runtime load path mungery. Simplifies ↵Jeremy Kemper2009-09-242-2/+2
| | | | | | | | 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-244-15/+108
| |
| * SessionRestoreError belongs in ADJoshua Peek2009-09-235-13/+12
| |