github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-01-30 00:38:00 -05:00
Code Issues Packages Projects Releases Wiki Activity
5,564 Commits 34 Branches 105 Tags
v2.0.0_PR
Commit Graph

2183 Commits

Author SHA1 Message Date
David Heinemeier Hansson
7275d2749c Fixed JSON encoding to use quoted keys according to the JSON standard (closes #8762) [choonkat/chuyeow] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7697 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-30 20:57:50 +00:00
David Heinemeier Hansson
752721c072 Updated 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7684 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-29 22:13:10 +00:00
David Heinemeier Hansson
8e067b0b44 Fixed that a response has to be available for that exact mime type for it to be called (otherwise 406 should occur) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-29 21:56:21 +00:00
David Heinemeier Hansson
826f0bd42f Fixed that strip_tags blows up with invalid html (closes #9730) [lifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-29 20:19:33 +00:00
Michael Koziarski
4953563e08 Ensure request is present, as well as defined. [nzkoz] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-29 02:19:16 +00:00
Michael Koziarski
9660360d6b Re-enable Routing optimisation code for _url methods, add defined?(request) to the guard conditions 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7673 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-28 20:57:39 +00:00
Rick Olson
82ff27766d Better error messages if you leave out the :secret option for request forgery protection. Closes #9670 [rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-28 16:50:48 +00:00
Michael Koziarski
c1bdf027d8 Add missing require 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7670 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-28 16:48:59 +00:00
Rick Olson
5edc81dcc2 Allow ability to disable request forgery protection, disable it in test mode by default. Closes #9693 [lifofifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-28 15:55:45 +00:00
David Heinemeier Hansson
e3b49c052b Fixed spelling errors (closes #9706) [tarmo/rmm5t] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-28 14:18:47 +00:00
David Heinemeier Hansson
3c695356ae Fixed the layout defaults (closes #9564) [lifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-28 01:23:20 +00:00
Nicholas Seckar
5430eb6dcd Avoid calling is_missing on LoadErrors. Closes #7460. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7644 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-27 05:04:02 +00:00
Jeremy Kemper
1c68394b68 Reinstate the default AR.instantiate_observers to_prepare block. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7641 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-26 01:29:28 +00:00
Jeremy Kemper
f08da31a4f Move Railties' Dispatcher to ActionController::Dispatcher, introduce before_ and after_dispatch callbacks, and warm up to non-CGI requests. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7640 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-26 01:24:07 +00:00
David Heinemeier Hansson
82c1fed89f Protect button_to behind protect_from_forgery (closes #9675) [lifo] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7636 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-25 16:50:35 +00:00
David Heinemeier Hansson
42d35472b2 Please do remember 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7633 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-25 16:40:56 +00:00
David Heinemeier Hansson
7ca53e1d31 Added another failing test 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7632 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-25 16:37:43 +00:00
David Heinemeier Hansson
2a6f8c99da Doh, forgot this file 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7631 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-25 16:30:38 +00:00
David Heinemeier Hansson
06dd4b3166 Better failing tests 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-25 15:09:21 +00:00
David Heinemeier Hansson
55a9c86e62 Added failing tests for iphone 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7629 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-25 14:57:15 +00:00
David Heinemeier Hansson
501244fee4 Updated iphone_with_html_response_type to fail as it uses the new register_alias approach 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7625 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 23:44:36 +00:00
David Heinemeier Hansson
bdf5672077 Change from InvalidToken to InvalidAuthenticityToken to be more specific 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7623 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 23:12:25 +00:00
David Heinemeier Hansson
e70bb8031f Stop rdoc from whining 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7622 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 23:01:50 +00:00
Jeremy Kemper
dfcb5af2dc Move rescue_action_with_handler from rescue_action to perform_action so it isn't clobbered by test overrides. References #9449, closes #9645. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7618 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 19:56:11 +00:00
Jeremy Kemper
40f9fd39f6 Include asset host in public path cache key. Clear cache between asset tag tests. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 19:47:45 +00:00
Rick Olson
2c73115b2f port over some of the csrf_killer README docs 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7614 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 17:59:17 +00:00
David Heinemeier Hansson
911ea2f26f Beefed up docs a bit 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7612 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 17:02:02 +00:00
Jeremy Kemper
7f9a6c0d92 Cache computed public asset paths. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7611 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 09:18:30 +00:00
Jeremy Kemper
8db51ee3c0 Cache more file existence checks. Flip-flop escaping. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7610 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 08:26:04 +00:00
Jeremy Kemper
871b87a323 Cache file existence checks and the list of all stylesheet sources. Manually escape tag attributes. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7609 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 08:15:56 +00:00
Jeremy Kemper
4b33306c70 The tag helper may bypass escaping. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7608 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 08:13:55 +00:00
Jeremy Kemper
38454983b4 Cache asset ids. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7607 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 06:25:13 +00:00
Jeremy Kemper
e711d8fade escape_once uses negative lookahead to avoid double-escaping instead of a second gsub 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7606 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-24 05:43:59 +00:00
Jeremy Kemper
cb5b8a7f05 Optimized named routes respect AbstractRequest.relative_url_root. Closes #9612. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7605 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 22:52:57 +00:00
David Heinemeier Hansson
2cfe118305 Dont need all of test/unit (closes #6673) [zenspider/josh] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7602 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 22:12:45 +00:00
Jeremy Kemper
6580b3ab00 Remove , and ; (comma and semicolon) from routing separators again. References #8558. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7599 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 21:58:02 +00:00
David Heinemeier Hansson
7d9fe04b1d Fixed cache_page to use the request url instead of the routing options when picking a save path (closes #8614) [josh] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7598 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 21:56:52 +00:00
Jeremy Kemper
a6f49d9b78 Introduce ActionController::Base.rescue_from to declare exception-handling methods. Cleaner style than the case-heavy rescue_action_in_public. Closes #9449. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7597 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 21:56:22 +00:00
Rick Olson
c619003854 Rename some RequestForgeryProtection methods. The class method is now #protect_from_forgery, and the default parameter is now 'authenticity_token'. [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7596 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 18:14:44 +00:00
Rick Olson
da0725aae3 move TextHelper#sanitize config options to the TextHelper module so it can be included and used with any class, not just ActionView::Base 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7595 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 18:09:46 +00:00
Rick Olson
4e3ed5bc44 Merge csrf_killer plugin into rails. Adds RequestForgeryProtection model that verifies session-specific _tokens for non-GET requests. [Rick] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7592 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 02:32:55 +00:00
Rick Olson
2d02199e15 Secure #sanitize, #strip_tags, and #strip_links helpers against xss attacks. Closes #8877. [Rick, lifofifo, Jacques Distler] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7589 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-23 00:11:08 +00:00
David Heinemeier Hansson
f3bf372630 Test fix (closes #6911) 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7587 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 23:26:22 +00:00
David Heinemeier Hansson
f0dc2774e8 Improve tests (closes #7240) [josh] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7581 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 23:11:45 +00:00
David Heinemeier Hansson
ee45d76df8 Roll back #7578, tests failed 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7580 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 23:10:41 +00:00
David Heinemeier Hansson
9ab8d4d9ed Improve the error message for assert_redirected_to (closes #7337) [sandofsky] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7578 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 22:22:20 +00:00
Michael Koziarski
7573791284 Disable the routing optimisation code when dealing with foo_url helpers. Add test to actionmailer to expose the problem they introduced. References #9450 [Koz] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7572 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 19:20:06 +00:00
Nicholas Seckar
defb4d08dc Remove use of & logic operator. Closes #8114. 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 19:02:51 +00:00
David Heinemeier Hansson
da5d8fa6ad Fixed JavaScriptHelper#escape_javascript to also escape closing tags (closes #8023) [rubyruy] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7567 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 18:31:44 +00:00
David Heinemeier Hansson
9686dcdb5b Fixed TextHelper#word_wrap for multiline strings with extra carrier returns (closes #8663) [seth] 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7562 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
 2007-09-22 18:21:54 +00:00