Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add options_from_collection_for_select to select_tag doco [hat-tip to ↵ | Ryan Bigg | 2009-12-16 | 1 | -0/+3 |
| | | | | anathematic] | ||||
* | Fixed grammar. | Mike Naberezny | 2009-11-21 | 1 | -1/+1 |
| | |||||
* | Updated link to RedCloth. | Mike Naberezny | 2009-11-21 | 1 | -4/+2 |
| | |||||
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2009-11-17 | 17 | -114/+99 |
|\ | | | | | | | | | Conflicts: activesupport/lib/active_support/core_ext/hash/conversions.rb | ||||
| * | Allow explicit placement of hidden id element for nested models. | Will Read | 2009-11-15 | 1 | -2/+11 |
| | | | | | | | | | | | | [#3259 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | Silence warning: discarding old h | Bryan Helmkamp | 2009-11-09 | 1 | -0/+1 |
| | | |||||
| * | Fix some Ruby warnings: `*' interpreted as argument prefix | Bryan Helmkamp | 2009-11-09 | 1 | -1/+1 |
| | | |||||
| * | Share ActionView::TestCase's output_buffer with view for concat support. | Chris Hapgood | 2009-11-07 | 1 | -0/+1 |
| | | | | | | | | | | | | [#3467 state:resolved] Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com> | ||||
| * | When rendering layouts with blocks, use #capture to avoid assuming that the ↵ | Nathan Weizenbaum | 2009-11-05 | 1 | -4/+2 |
| | | | | | | | | | | | | return value is the block's content. Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | Extracted localized_cache.rb from ActionController, added it to ↵ | José Valim | 2009-11-01 | 1 | -2/+2 |
| | | | | | | | | AbstractController and made ActionMailer use it. | ||||
| * | Improve AbstractController layouts coverage. | José Valim | 2009-11-01 | 1 | -2/+2 |
| | | |||||
| * | Remove ActionMailer helpers and rely on AbstractController one. | José Valim | 2009-11-01 | 1 | -1/+1 |
| | | |||||
| * | First pass at cleaning up action caching | Yehuda Katz | 2009-10-28 | 1 | -1/+0 |
| | | |||||
| * | Reduce TextTemplate cost for simple cases | Yehuda Katz | 2009-10-28 | 1 | -1/+3 |
| | | |||||
| * | Fix error_messages_for when instance variable names are given. | José Valim | 2009-10-21 | 1 | -6/+6 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Bring agnosticism to error_messages_for. | José Valim | 2009-10-17 | 2 | -8/+12 |
| | | |||||
| * | Make encodings work with Erubis and 1.9 again | Yehuda Katz | 2009-10-16 | 1 | -3/+5 |
| | | |||||
| * | Fix a bug where templates with locales were not being sorted correctly | Yehuda Katz | 2009-10-16 | 1 | -1/+1 |
| | | |||||
| * | Merge branch 'master' into orchestra | Jeremy Kemper | 2009-10-15 | 1 | -1/+10 |
| |\ | |||||
| | * | Change config implementation in AV slightly | Yehuda Katz | 2009-10-15 | 1 | -1/+10 |
| | | | |||||
| * | | Renamed Orchestra to Notifications once again [#3321 state:resolved] | José Valim | 2009-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Unify benchmark APIs. | José Valim | 2009-10-15 | 2 | -56/+4 |
| | | | |||||
| * | | Update Orchestra instrumentations and move part of logging to Orchestra. | José Valim | 2009-10-15 | 1 | -1/+1 |
| | | | |||||
| * | | Revert "Rename Orchestra to Notifications [#3321 state:resolved]" | José Valim | 2009-10-15 | 1 | -1/+1 |
| |/ | | | | | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2. | ||||
| * | Make this less brittle and work on 1.8 | Yehuda Katz | 2009-10-15 | 1 | -9/+9 |
| | | |||||
| * | Make the erubis implementation easier for plugins to change. | Michael Koziarski | 2009-10-15 | 1 | -1/+4 |
| | | |||||
| * | Add a read-only method which plugin authors can use to determine if xss ↵ | Michael Koziarski | 2009-10-15 | 1 | -0/+5 |
| | | | | | | | | | | | | | | escaping. This doesn't provide a way to turn off the escaping, but alternative template engine authors can figure out what their default should be by calling this. Avoids a messy version + plugin check. | ||||
| * | Rename Orchestra to Notifications [#3321 state:resolved] | Joshua Peek | 2009-10-14 | 1 | -1/+1 |
| | | |||||
| * | Make sure non-escaped urls aren't considered safe | Michael Koziarski | 2009-10-15 | 1 | -1/+1 |
| | | |||||
| * | Use ERB::Util.h over CGI.escapeHTML as the former is safety aware and the ↵ | Michael Koziarski | 2009-10-15 | 1 | -1/+1 |
| | | | | | | | | latter isn't | ||||
| * | ActionView.url_for doesn't escape by default | Phil Darnowsky | 2009-10-15 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ActionView::Helpers::UrlHelper#url_for used to escape the URLs it generated by default. This was most commonly seen when generating a path with multiple query parameters, e.g. url_for(:controller => :foo, :action => :bar, :this => 123, :that => 456) would return http://example.com/foo/bar?that=456&this=123 escaping an ampersand that shouldn't be escaped. This is both wrong and inconsistent with the behavior of ActionController#url_for, and is changed. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | Start adding configuration to ActionView instead of using constants. | Yehuda Katz | 2009-10-14 | 2 | -13/+17 |
| | | | | | | | | | | | | | | By using config rather than hardcoded constants, we can evolve the configuration system over time (we'd just need to update the config method with more robust capabilities and all consumers would get the capabilities with no code changes) | ||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-10-10 | 23 | -49/+149 |
|\| | |||||
| * | 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 |
| | | |||||
| * | 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 | 1 | -2/+5 |
| | | |||||
| * | 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 | 19 | -32/+112 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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 |
| | | |||||
| * | NumberHelper depends on big decimal extensions | Joshua Peek | 2009-10-03 | 1 | -0/+1 |
| | | |||||
* | | Merge commit 'mainstream/master' | Pratik Naik | 2009-09-30 | 8 | -104/+215 |
|\| | |||||
| * | Ported the new ActionView::TestCase from 2-3-stable to master [#3260 | Erik Ostrom | 2009-09-28 | 2 | -25/+101 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] | ||||
| * | Restore split between require-time and runtime load path mungery. Simplifies ↵ | Jeremy Kemper | 2009-09-24 | 1 | -1/+1 |
| | | | | | | | | vendor requires. | ||||
| * | Clean up log output for rendered templates | Joshua Peek | 2009-09-24 | 4 | -67/+87 |
| | |