Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | New routing dsl | Joshua Peek | 2009-10-20 | 4 | -787/+1101 |
| | |||||
* | Group together all the old routing dsl logic | Joshua Peek | 2009-10-20 | 5 | -211/+199 |
| | |||||
* | Move Routing into AD | Joshua Peek | 2009-10-20 | 9 | -709/+713 |
| | |||||
* | Replace decaying routing internals w/ rack-mount | Joshua Peek | 2009-10-19 | 12 | -1237/+340 |
| | |||||
* | Only undef to_json if it's defined | Jeremy Kemper | 2009-10-19 | 1 | -1/+1 |
| | |||||
* | Bring agnosticism to error_messages_for. | José Valim | 2009-10-17 | 2 | -8/+12 |
| | |||||
* | Unify class_inheritable_accessor and extlib_inheritable_accessor and allow ↵ | José Valim | 2009-10-17 | 1 | -6/+3 |
| | | | | responder to be set in the class level. | ||||
* | Make encodings work with Erubis and 1.9 again | Yehuda Katz | 2009-10-16 | 1 | -3/+5 |
| | |||||
* | Use Rails.application where we want a valid rack app | Joshua Peek | 2009-10-16 | 2 | -2/+2 |
| | |||||
* | Deprecate RAILS_ROOT in favor of Rails.root (which proxies to the ↵ | Carl Lerche | 2009-10-16 | 1 | -1/+1 |
| | | | | application's object root) | ||||
* | 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 | 5 | -10/+10 |
| | | |||||
* | | Unify benchmark APIs. | José Valim | 2009-10-15 | 5 | -95/+12 |
| | | |||||
* | | Update Orchestra instrumentations and move part of logging to Orchestra. | José Valim | 2009-10-15 | 5 | -34/+22 |
| | | |||||
* | | Revert "Rename Orchestra to Notifications [#3321 state:resolved]" | José Valim | 2009-10-15 | 4 | -8/+8 |
|/ | | | | 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. | ||||
* | Punt on ConcurrentHash [#3322 state:resolved] | Joshua Peek | 2009-10-14 | 1 | -5/+5 |
| | |||||
* | Rename Orchestra to Notifications [#3321 state:resolved] | Joshua Peek | 2009-10-14 | 4 | -8/+8 |
| | |||||
* | Make IntegrationTest::Runner propagate method_missing to ancestors. | George Ogata | 2009-10-15 | 1 | -2/+6 |
| | | | | | | | Fixes RSpec integration example groups, which mixes its Matchers module into ActiveSupport::TestCase. Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
* | Test cases should see all the cookies, not just cookies that have been set ↵ | Craig Smith | 2009-10-15 | 1 | -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] | ||||
* | 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 | 2 | -2/+2 |
| | | | | 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) | ||||
* | CookieJar#delete should return the key's value, consistent with a Hash | Jeffrey Hardy | 2009-10-14 | 1 | -1/+2 |
| | | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Callbacks, DeprecatedCallbacks = NewCallbacks, Callbacks | Joshua Peek | 2009-10-12 | 2 | -6/+4 |
| | |||||
* | Use "run_callbacks :foo" since it is the public api for callbacks [#3329 | Joshua Peek | 2009-10-12 | 2 | -4/+4 |
| | | | | state:resolved] | ||||
* | 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 |
| | |||||
* | 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] |