Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed an example that was missing a colon for a hash-key. | Ben Orenstein | 2009-10-30 | 1 | -1/+1 |
| | |||||
* | Merge commit 'mainstream/master' | Pratik Naik | 2009-10-10 | 29 | -55/+190 |
|\ | |||||
| * | Fix a bug where render :text could not handle yield :symbol. Fixes guides ↵ | Yehuda Katz | 2009-10-10 | 1 | -9/+13 |
| | | | | | | | | generation | ||||
| * | Fix issue with standalone ActionView | Yehuda Katz | 2009-10-09 | 1 | -1/+4 |
| | | |||||
| * | Avoid super in define_method for Rubinius | Yehuda Katz | 2009-10-09 | 1 | -1/+6 |
| | | |||||
| * | Get rid of constant name usage for stack trace help in favor of overriding ↵ | Yehuda Katz | 2009-10-09 | 1 | -9/+9 |
| | | | | | | | | #inspect and .name. | ||||
| * | Finish porting over the initializers to the app object and fix all the tests | Carl Lerche | 2009-10-08 | 2 | -3/+6 |
| | | |||||
| * | API change: content_tag_for outputs prefixed class name | Joshua Peek | 2009-10-08 | 1 | -3/+3 |
| | | |||||
| * | Fix warning spew for 1.9 | Carl Lerche | 2009-10-08 | 1 | -1/+5 |
| | | |||||
| * | error procs have to be safe too | Michael Koziarski | 2009-10-08 | 1 | -1/+1 |
| | | |||||
| * | Switch to on-by-default XSS escaping for rails. | Michael Koziarski | 2009-10-08 | 20 | -35/+115 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 anymore | Yehuda Katz | 2009-10-07 | 1 | -2/+5 |
| | | |||||
| * | Fix warning spew | Yehuda Katz | 2009-10-06 | 1 | -1/+3 |
| | | |||||
| * | Coerce all out going body parts to Strings | Joshua Peek | 2009-10-05 | 2 | -0/+30 |
| | | |||||
| * | Revert "Revert "Fix Dispatch.new so passenger works" as it broke the build" | Joshua Peek | 2009-10-05 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 49b52cadc2e66c11a025e7719837ae77b3736046. | ||||
| * | Revert "Fix Dispatch.new so passenger works" as it broke the build | Michael Koziarski | 2009-10-05 | 1 | -1/+1 |
| | | | | | | | | This reverts commit c97c31b096e627480b64403d1460065738941c3e. | ||||
| * | Fix Dispatch.new so passenger works | Joshua Peek | 2009-10-04 | 1 | -1/+1 |
| | | |||||
| * | NumberHelper depends on big decimal extensions | Joshua Peek | 2009-10-03 | 1 | -0/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-09-30 | 27 | -321/+589 |
|\| | |||||
| * | Initialize a new instance of Rails.application during integration tests | Carl Lerche | 2009-09-30 | 1 | -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 [#3260 | Erik Ostrom | 2009-09-28 | 3 | -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 Trupiano | 2009-09-28 | 2 | -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 Pignata | 2009-09-28 | 1 | -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 Peek | 2009-09-26 | 3 | -12/+6 |
| | | | | | | | | application object | ||||
| * | Allow setting a default application for all integration tests | Joshua Peek | 2009-09-26 | 1 | -2/+20 |
| | | |||||
| * | Allow integration test rack app to be set with "@app" ivar instead of using ↵ | Joshua Peek | 2009-09-26 | 1 | -2/+3 |
| | | | | | | | | open_session | ||||
| * | Move default middleware stack into initializer | Joshua Peek | 2009-09-26 | 2 | -20/+1 |
| | | |||||
| * | Move Rails::Static into ActionDispatch | Joshua Peek | 2009-09-26 | 2 | -1/+46 |
| | | |||||
| * | Extract "parse_config" into AD | Joshua Peek | 2009-09-25 | 2 | -0/+21 |
| | | |||||
| * | Fix generic url rewriter in integration tests | Joshua Peek | 2009-09-25 | 1 | -1/+1 |
| | | |||||
| * | Restore split between require-time and runtime load path mungery. Simplifies ↵ | Jeremy Kemper | 2009-09-24 | 1 | -1/+1 |
| | | | | | | | | vendor requires. | ||||
| * | Move railties/lib/* into railties/lib/* | Yehuda Katz + Carl Lerche | 2009-09-24 | 1 | -0/+1 |
| | | |||||
| * | Clean up log output for rendered templates | Joshua Peek | 2009-09-24 | 4 | -67/+87 |
| | | |||||
| * | Resurrect AC::Benchmarking [#3140 state:resolved] | Joshua Peek | 2009-09-24 | 3 | -3/+97 |
| | | |||||
| * | SessionRestoreError belongs in AD | Joshua Peek | 2009-09-23 | 5 | -13/+12 |
| | | |||||
| * | Move helpers specific to functional tests out of TestProcess into AC::TestCase | Joshua Peek | 2009-09-23 | 2 | -152/+149 |
| | | |||||
| * | Move integration test runner into ActionDispatch | Joshua Peek | 2009-09-23 | 6 | -9/+20 |
| | | |||||
| * | Fixes Sam Ruby tests suite. | José Valim | 2009-09-21 | 1 | -6/+1 |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-09-21 | 36 | -763/+374 |
|\| | |||||
| * | Use NewCallbacks on ActionDispatch::Callbacks. | José Valim | 2009-09-20 | 3 | -25/+41 |
| | | |||||
| * | Add Orchestra instrumentation to fragment and page caching. | José Valim | 2009-09-20 | 6 | -66/+57 |
| | | |||||
| * | Instrument process_action, render and sql. | José Valim | 2009-09-20 | 2 | -6/+11 |
| | | |||||
| * | 1.9 fix for changes to #to_s. By Sam Ruby. [#3228 state:resolved] | Yehuda Katz | 2009-09-18 | 1 | -2/+2 |
| | | |||||
| * | Forward all methods to delayed log | Joshua Peek | 2009-09-16 | 1 | -6/+8 |
| | | |||||
| * | Remove unused code in ActionView. | José Valim | 2009-09-15 | 4 | -133/+0 |
| | | | | | | | | Signed-off-by: Yehuda Katz <wycats@gmail.com> | ||||
| * | Beef up AD::Rescue to replace global exception handling lost in ↵ | Joshua Peek | 2009-09-15 | 1 | -4/+16 |
| | | | | | | | | ApplicationController | ||||
| * | Remove global exception catching from ApplicationController. | Joshua Peek | 2009-09-15 | 2 | -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 setup | Jeremy Kemper | 2009-09-14 | 2 | -9/+9 |
| | | |||||
| * | Uses extlib_inheritable_accessor | Jeremy Kemper | 2009-09-14 | 1 | -0/+2 |
| | | |||||
| * | Rollback AS bundler work and improve activation of vendored dependencies | Joshua Peek | 2009-09-13 | 1 | -1/+1 |
| | |