10265 Commits

Author SHA1 Message Date
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
Jeremy Kemper
3dea8b580b Dispatcher tests. References #9630.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7591 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-23 02:11:44 +00:00
Jeremy Kemper
ea45680118 Object.subclasses_of includes anonymous subclasses.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7590 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-23 01:09:20 +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
Jeremy Kemper
4965b1b961 Correctly quote id list for limited eager loading. Closes #7482.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7588 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 23:51:03 +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
32b31a2d0d More tests (closes #7066) [sethladd]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7586 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 23:21:35 +00:00
David Heinemeier Hansson
82a85e8592 Skip svnindex.xsl files when installing plugins (closes #7070) [davidjrice]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7585 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 23:20:48 +00:00
David Heinemeier Hansson
5757fb61d8 self.fixture_class_names is defined twice in fixtures.rb (closes #7135) [jarkko]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7584 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 23:17:01 +00:00
David Heinemeier Hansson
0b2e059f0a Removed unnecessary or statement (closes #7158) [richcollins]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7583 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 23:15:54 +00:00
David Heinemeier Hansson
953de118db Improve tests (closes #7166) [zackchandler]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7582 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 23:12:24 +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
Michael Koziarski
1abe5a2ded Fix broken mysql test [frederick.cheung@gmail.com]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7579 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 22:33:51 +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
David Heinemeier Hansson
766fbce04e Fixed that using version-targetted migrates would fail on loggers other than the default one (closes #7430) [valeksenko]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7577 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 22:18:55 +00:00
David Heinemeier Hansson
4cf23c9f8e Print Rails version when starting console (closes #7440) [eyematz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7576 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 22:17:10 +00:00
David Heinemeier Hansson
833bd62e20 Fix CSS error in scaffold (closes #7450) [kampers]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7575 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 22:14:16 +00:00
David Heinemeier Hansson
35e382627e Added rake db:version to get the current schema version from the command line (closes #7521) [pelargir]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7574 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 22:12:10 +00:00
David Heinemeier Hansson
1d4002d462 Fixed the placement of fixture files for nested models when generating through script/generate model (closes #7547) [jkit]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7573 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 22:10:49 +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
0442f1ea75 Docfix (closes #7593) [tarmo]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7570 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:35:41 +00:00
David Heinemeier Hansson
3dcae9fefd Fixed that pluralizing an empty string should return the same empty string, not "s" (closes #7720) [josh]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7569 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:34:43 +00:00
David Heinemeier Hansson
59c36fd456 Added TEMPLATE option to rake doc:app to set a custom output template (closes #7737) [Jakob S]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7568 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:33:39 +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
9809dc4540 Added VERBOSE option to rake db:migrate to turn off output #8204 [jbarnette]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7566 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:28:53 +00:00
David Heinemeier Hansson
05f173e2c2 Added call to inspect on non-string classes for the logger (closes #8533) [codahale]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7565 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:25:30 +00:00
David Heinemeier Hansson
2a34e082f3 Doc fixes (closes #8608) [deepblue]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7564 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:24:17 +00:00
David Heinemeier Hansson
046a87a855 Fixed rename_column for SQLite when using symbols for the column names (closes #8616) [drodriguez]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7563 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:23:30 +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
David Heinemeier Hansson
286bd9b9f0 Docfix (closes #8767) [kampers]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7561 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:17:53 +00:00
David Heinemeier Hansson
18a24274ec Allow frameworks to be required by their gem name (closes #8845) [drnic]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7560 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:15:05 +00:00
David Heinemeier Hansson
712b71371d Doc fix (closes #9123) [tzaharia]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7559 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:03:31 +00:00
David Heinemeier Hansson
2f8146bc5e Use rel="stylesheet" in lowercase as prescribed by XHTML standards (closes #8910) [RSL]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7558 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 18:01:54 +00:00
David Heinemeier Hansson
15467a43f5 Fix tests across DST (closes #9020) [mpalmer]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7557 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:58:31 +00:00
David Heinemeier Hansson
00326bb0b4 Make date tests pass on 64-bit (closes #9121) [mutru]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7556 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:57:10 +00:00
David Heinemeier Hansson
f18c24c397 Fixed that rake doc:app should use UTF-8 (closes #8906) [farzy]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7555 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:55:57 +00:00
David Heinemeier Hansson
0f3d8707db Removed unused @join_sql reference (closes #9174) [danger]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7554 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:53:39 +00:00
David Heinemeier Hansson
f336cf463c Fixes rake annotations to search erb and builder files as well (closes #9150) [m.langenberg]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7553 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:52:11 +00:00
David Heinemeier Hansson
9b55e3dad1 Make tests run with mocha gem
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:48:54 +00:00
David Heinemeier Hansson
c361caf8b4 Doc fix (closes #9203) [lazyatom]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7551 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:43:31 +00:00
David Heinemeier Hansson
ac4f37ecbb Doc fix (closes #9259) [caio]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7550 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:41:03 +00:00
David Heinemeier Hansson
0faa4ca04c Doc fix (closes #9323) [Henrik N]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7549 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:39:55 +00:00
David Heinemeier Hansson
ecceb87358 Doc fix (closes #9414) [Henrik N]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7548 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:38:48 +00:00
David Heinemeier Hansson
6ccf503229 Test requirement fix (closes #9276) [lazyatom]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7547 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:37:39 +00:00
David Heinemeier Hansson
a5fde99873 Plugin license and README should use a dynamic year (closes #9329) [bscofield]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7546 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:34:01 +00:00
David Heinemeier Hansson
6203d4574c Improved test coverage (closes #7571) [joost]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7545 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:32:39 +00:00
Michael Koziarski
39b77ca347 Remove last mentions of AWS from railties
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7544 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:21:40 +00:00
Michael Koziarski
0ba96e0568 Remove the AWS web_service generator
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7543 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2007-09-22 17:19:42 +00:00