aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Bundle arel for AR integration testsJeremy Kemper2009-10-191-5/+4
|
* Only undef to_json if it's definedJeremy Kemper2009-10-191-1/+1
|
* Merge commit 'josevalim/fixes'Jeremy Kemper2009-10-197-66/+66
|\ | | | | | | | | Conflicts: railties/test/generators/app_generator_test.rb
| * Bring agnosticism to error_messages_for.José Valim2009-10-175-60/+55
| |
| * Unify class_inheritable_accessor and extlib_inheritable_accessor and allow ↵José Valim2009-10-172-6/+11
| | | | | | | | responder to be set in the class level.
* | Merge branch 'master' of github.com:rails/railsJeremy Kemper2009-10-192-195/+108
|\ \
| * | Relax generation requirements and only enforce the requirements used in the ↵Joshua Peek2009-10-181-13/+0
| | | | | | | | | | | | path segment
| * | Don't use use_controllers in routing testsJoshua Peek2009-10-181-4/+4
| | |
| * | This is routing error message test is tightly coupled to the implementation. ↵Joshua Peek2009-10-171-16/+1
| | | | | | | | | | | | Just test that it raises an exception.
| * | Drop legacy support for case insensitive controller recognitionJoshua Peek2009-10-171-11/+0
| | |
| * | Fix brittle query string comparisonsJoshua Peek2009-10-171-5/+5
| | |
| * | Fix brittle query string comparisonsJoshua Peek2009-10-171-7/+18
| | |
| * | Fix standalone run of routing test. Only reference controllers that are ↵Joshua Peek2009-10-171-8/+8
| | | | | | | | | | | | provided in fake_controllers
| * | Stop using with_controllers in testsJoshua Peek2009-10-171-96/+72
| | |
| * | No longer need this special routing exception message because these kinds of ↵Joshua Peek2009-10-171-13/+0
| | | | | | | | | | | | ambiguous generations are deprecated
| * | Drop support for routing :generate_allJoshua Peek2009-10-171-14/+0
| | |
| * | Invalid route requirements should always raise an exception even if they are ↵Joshua Peek2009-10-171-8/+0
| |/ | | | | | | unused
* / Use rails/rackJeremy Kemper2009-10-161-1/+1
|/
* Make encodings work with Erubis and 1.9 againYehuda Katz2009-10-161-3/+5
|
* Use Rails.application where we want a valid rack appJoshua Peek2009-10-162-2/+2
|
* Deprecate RAILS_ROOT in favor of Rails.root (which proxies to the ↵Carl Lerche2009-10-161-1/+1
| | | | application's object root)
* We won't be publishing tars and zips anymoreJoshua Peek2009-10-161-7/+5
|
* Fix a bug where templates with locales were not being sorted correctlyYehuda Katz2009-10-161-1/+1
|
* Merge branch 'master' into orchestraJeremy Kemper2009-10-157-9/+18
|\
| * Fix a few more 1.9 bugs. Rack 1.0.1 is required for 1.9 compliance but not ↵Yehuda Katz2009-10-152-2/+2
| | | | | | | | release, so bundling 1.0.1 from git
| * Rack responses need to wrap Strings in 1.9Yehuda Katz2009-10-151-1/+1
| |
| * Update MetalTest for constant scoping change in 1.9Yehuda Katz2009-10-151-2/+2
| |
| * Fix test to correctly handle 1.9 Array#to_s behaviorYehuda Katz2009-10-151-1/+1
| |
| * Work around apparent bug in 1.9Yehuda Katz2009-10-151-2/+2
| |
| * Change config implementation in AV slightlyYehuda Katz2009-10-151-1/+10
| |
* | Renamed Orchestra to Notifications once again [#3321 state:resolved]José Valim2009-10-156-11/+11
| |
* | Unify benchmark APIs.José Valim2009-10-156-181/+12
| |
* | Instrument cache store events only if required.José Valim2009-10-151-1/+1
| |
* | Update Orchestra instrumentations and move part of logging to Orchestra.José Valim2009-10-156-42/+23
| |
* | Revert "Rename Orchestra to Notifications [#3321 state:resolved]"José Valim2009-10-155-10/+10
|/ | | | This reverts commit 8cbf825425dc8ad3770881ea4e100b9023c69ce2.
* Make this less brittle and work on 1.8Yehuda Katz2009-10-151-9/+9
|
* Kill rake bundleJeremy Kemper2009-10-151-10/+0
|
* AP tests depend on ARJeremy Kemper2009-10-151-0/+1
|
* Make the erubis implementation easier for plugins to change.Michael Koziarski2009-10-151-1/+4
|
* Add a read-only method which plugin authors can use to determine if xss ↵Michael Koziarski2009-10-151-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.
* Don't push siblings on load path if using bundled envJeremy Kemper2009-10-141-5/+8
|
* Merge branch 'arel'Jeremy Kemper2009-10-141-6/+10
|\
| * Clarify AR dependencyJeremy Kemper2009-10-141-6/+10
| |
* | Punt on ConcurrentHash [#3322 state:resolved]Joshua Peek2009-10-141-5/+5
| |
* | Rename Orchestra to Notifications [#3321 state:resolved]Joshua Peek2009-10-145-10/+10
|/
* Make IntegrationTest::Runner propagate method_missing to ancestors.George Ogata2009-10-152-2/+24
| | | | | | | 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 Smith2009-10-152-1/+18
| | | | | | | | | | | | | 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 safeMichael Koziarski2009-10-152-1/+6
|
* Use ERB::Util.h over CGI.escapeHTML as the former is safety aware and the ↵Michael Koziarski2009-10-152-2/+2
| | | | latter isn't
* ActionView.url_for doesn't escape by defaultPhil Darnowsky2009-10-152-4/+14
| | | | | | | | | | | | | | | | | 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&amp;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>