Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: rails/rails
...
head fork: rails/rails
Commits on Oct 26, 2006
@dhh dhh Branches so we can just get the bug fixes out of the way before shipp…
…ing 1.2

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5368 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2227a17
Commits on Oct 27, 2006
@NZKoz NZKoz Merge Statistics cleanup to release branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5370 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
746cfb3
Commits on Oct 28, 2006
@madrobby madrobby Update to latest Prototype, which doesnt serialize disabled form elem…
…ents, adds clone() to arrays, empty/non-string Element.update() and adds a fixes excessive error reporting in WebKit beta versions [Thomas Fuchs]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5372 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
159411f
Commits on Oct 31, 2006
@NZKoz NZKoz Revert environment.rb changes for autoloading
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5377 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
7e8dd03
Commits on Nov 01, 2006
Scott Barron Merge breakpoint/1.8.5 fix from [5380]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5381 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6eb941e
@jeremy jeremy Merge [5378] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5382 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e09f224
@jeremy jeremy Merge [5379] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5383 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8e01efe
@jeremy jeremy Merge [5384] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5385 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
503c7c0
@seckar seckar Update dependencies to allow constants to be defined alongside their …
…siblings. (Applying changeset [5386] to RC.)

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5387 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
229e197
Commits on Nov 02, 2006
@jeremy jeremy Merge [5388] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5389 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ce0653b
@NZKoz NZKoz merge rakefile changes to prerelease
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5391 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3311953
Scott Barron Merge in [5392] and [5393] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5394 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c7f28e0
@jeremy jeremy Merge [5395] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5396 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9f26164
@jeremy jeremy Merge [5397] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5398 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f4d8803
@jeremy jeremy Merge [5399] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5400 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a746e39
@jeremy jeremy Merge [5401] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5402 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
31b901a
@jeremy jeremy Merge [5403] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5404 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
526afd3
@jeremy jeremy Merge [5405] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5406 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e4e1d2a
Scott Barron merge [5408] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5409 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
855e0f6
@jeremy jeremy Merge [5412] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5413 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
53c4903
@NZKoz NZKoz merge xmlsimple update to release branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5415 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2029b8a
@jeremy jeremy Merge [5416] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5417 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a2edd43
@jeremy jeremy Merge [5418] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5419 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
17e4458
Commits on Nov 03, 2006
@jeremy jeremy Merge [5420] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5fac326
@jeremy jeremy Merge [5422] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5350fda
Scott Barron merge [5424] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5425 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
7953eb1
Commits on Nov 05, 2006
@jeremy jeremy Merge [5427] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5428 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6439d0c
@jeremy jeremy Merge [5429] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5430 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
4aa358d
@jeremy jeremy Merge [5432] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5433 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
320875a
Commits on Nov 06, 2006
@madrobby madrobby Merge [5438] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5439 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5887b18
@jeremy jeremy Merge [5442] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5443 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5f5d8c2
Commits on Nov 07, 2006
@jeremy jeremy Merge [5445] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5446 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
013004b
@jamis jamis make add_order a tad faster
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5453 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
84668af
@seckar seckar Remove temporary crutch to help ApplicationController be unloaded. Cl…
…oses #6496.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5458 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cbffafb
@jeremy jeremy Merge [5459] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5460 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cc299d1
@jeremy jeremy Merge [5440], [5444], [5463], [5464] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5465 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ba086a4
@jeremy jeremy Merge [5466] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5467 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
dfa070a
Commits on Nov 09, 2006
@jeremy jeremy Merge [5469] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5470 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5e677b6
@seckar seckar Apply [5471] to RC
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5472 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
792780a
@jeremy jeremy Merge [5474] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5475 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5aced86
Commits on Nov 10, 2006
@technoweenie technoweenie merge [5476] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5479 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
bcd50f1
@jeremy jeremy Merge [5480] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5481 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
118764e
Commits on Nov 12, 2006
@jamis jamis Add grep-based fallback to reaper, to work in pidless setups
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5494 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
46b845e
@sstephenson sstephenson Merge [5486] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5498 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9f8c805
@sstephenson sstephenson Merge [5487] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5499 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9eaad14
@sstephenson sstephenson Merge [5497] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5500 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
69ada0e
Commits on Nov 13, 2006
@jeremy jeremy Merge [5501] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5502 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f7c94e9
@jeremy jeremy Merge [5506] from trunk. Set Rails::VERSION::STRING to 1.1.6 pending …
…1.2 release.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5508 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
85c4505
@jeremy jeremy Merge [5509] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5510 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b8a5d39
@jeremy jeremy Merge [5512] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5513 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
35240ba
@jeremy jeremy Merge [5514] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5515 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
86bd0da
Tobias Lütke Merge from [5516]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5517 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
924f5cd
Commits on Nov 14, 2006
@jeremy jeremy Merge [5518] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5519 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b8ff216
@jeremy jeremy Merge [5521] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5522 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
dd1dc5e
Commits on Nov 16, 2006
@jeremy jeremy Merge [5533] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5534 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
629b2ac
@jeremy jeremy Merge [5535], [5536] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5537 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a5631a5
@jeremy jeremy Merge [5531] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5538 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
af33784
@jeremy jeremy Merge [5541] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5542 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6baf948
Commits on Nov 17, 2006
@jeremy jeremy Merge [5543] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5545 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b7f094e
@seckar seckar Apply [5548] to RC
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5549 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
bef626e
@madrobby madrobby Update Prototype in RC to [5550]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5552 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
23569d8
Commits on Nov 18, 2006
@dhh dhh Active Resource will not ship with Rails 1.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5554 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0497868
@dhh dhh Merged [5546] and [5547] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5555 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
004a28d
@dhh dhh Merged [5473] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5556 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
acfe119
@dhh dhh Merged [5482] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5557 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ac22951
@dhh dhh Merged [5485] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5558 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fb60a46
@dhh dhh Merged [5503] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5559 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1e532f6
Commits on Nov 19, 2006
@dhh dhh Update changelogs in preparation for RC
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5560 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2a70f6f
@jeremy jeremy Merge [5561] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5562 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
97d9dca
@dhh dhh Scaffold resource should have both a layout and a stylesheet [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5566 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9ba9677
@technoweenie technoweenie merge [5571] and [5572] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5573 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
30e5436
@dhh dhh Made script/server work with -e and -d when using Mongrel [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5578 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b93e469
@madrobby madrobby Merge 1-2-pre-release with [5581]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5582 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
36b3cb2
Commits on Nov 20, 2006
@dhh dhh Proper dates
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5584 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
17921ba
@jeremy jeremy Merge [5589] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5590 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f2fd22c
@jeremy jeremy Merge [5591] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5592 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
af43e87
@jeremy jeremy Merge [5597] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5598 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ef6c3c4
@jeremy jeremy Merge [5586], [5596] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5599 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2043513
@madrobby madrobby Merge [5602] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5603 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
87ecb78
Commits on Nov 22, 2006
@seckar seckar Apply [5607] to RC. References #6669.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5608 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ffa2c5f
Commits on Nov 23, 2006
@dhh dhh Update release date for RC
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5610 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
766ca17
@dhh dhh Dont include the mime.yml anyway, Mongrel will just ship with more de…
…faults instead

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5611 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
34a3d04
@dhh dhh Made RAILS_GEM_VERSION work for beta gems too, so specifying 1.1.6 wi…
…ll give you 1.1.6.4520 if available [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5613 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
783c16b
@dhh dhh Actually require the gem found
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5615 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
82e5ff7
@dhh dhh Added ActiveRecord::Base.clear_active_connections! in development mod…
…e so the database connection is not carried over from request to request. Some databases won't reread the schema if that doesn't happen (I'm looking at you SQLite), so you have to restart the server after each migration (= no fun) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5617 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
12949bb
@dhh dhh Added text/csv as a default mime type and included example on how to …
…make your own in config/environment.rb [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5620 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
694957c
@dhh dhh * Added GET-masquarading for HEAD, so request.method will return :get…
… even for HEADs. This will help anyone relying on case request.method to automatically work with HEAD and map.resources will also allow HEADs to all GET actions. Rails automatically throws away the response content in a reply to HEAD, so you dont even need to worry about that. If you, for whatever reason, still need to distinguish between GET and HEAD in some edge case, you can use Request#head? and even Request.headers["REQUEST_METHOD"] for get the "real" answer. Closes #6694 [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5621 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fe1e771
@dhh dhh Fixed that HEAD should return the proper Content-Length header (that …
…is, actually use @body.size, not just 0) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5622 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c3cbd6b
Commits on Nov 25, 2006
@seckar seckar Apply [5624] to RC. References #6698.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5625 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3ee8096
@dhh dhh Dont set default charset if the response is sending a file. Closes #6689
 [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5626 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cef81e7
@dhh dhh Tried delaying database disconnect until after dependency resolution …
…(references #6687, #6700) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5627 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
509c920
Commits on Nov 26, 2006
@jeremy jeremy Merge [5629] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5630 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fd8ee0a
@jeremy jeremy Merge [5631] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5632 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8f3e81e
@dhh dhh redirect_to is the one place where _url should be used, not _path [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5633 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
691c439
@dhh dhh Fix that redirects should set "Location" header, not "location", and …
…remove dead CGI.redirect

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5634 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f83eedd
@jeremy jeremy Merge [5635] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5636 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5b8bfc4
@dhh dhh Only reload connections in development mode that supports (and requir…
…es that) -- in other words, only do it for SQLite (closes #6687, #6700) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5637 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
205ae50
Commits on Nov 27, 2006
@NZKoz NZKoz Ensure integration tests get the correct value of fixtures_path. Closes
#6672

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5639 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c4d4660
@NZKoz NZKoz ensure follow_redirect works with normalized headers
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5641 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fb6cd55
Commits on Nov 28, 2006
@jeremy jeremy Merge [5643] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5644 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b2ae346
@jeremy jeremy Use head. Stop last @response.redirect_url from bleeding through (sho…
…uld be recycled like request is).

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5645 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d6c28bf
Commits on Nov 29, 2006
@jeremy jeremy Merge [5435] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5651 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
87ef365
Commits on Nov 30, 2006
@dhh dhh Fixed that script/server running against Mongrel should tail the prop…
…er log regardless of the environment [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5652 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
91cd889
@dhh dhh Refactored to use same option setup
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5654 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
25d7ea8
Commits on Dec 01, 2006
@dhh dhh Replace the elaborate reloading connection checking scheme, just fix …
…the Ruby-based MySQL adapter, ye?

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5656 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f09c8c4
@dhh dhh If only life was that simple (it didnt help)
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5658 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
98a0440
@jeremy jeremy Merge [5660] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5661 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2890b96
@dhh dhh Wups
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5662 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
de3ec6c
Commits on Dec 03, 2006
@dhh dhh Fixed Array#to_xml when it contains a series of hashes (each piece wo…
…uld get its own XML declaration) (closes #6610) [thkarcher/cyu]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5668 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2b68762
@dhh dhh Documentation for generators (closes #6671) [topfunky]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5669 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2a08c45
Commits on Dec 04, 2006
@dhh dhh Dropped the idea of automatically routing :format for the vanilla rou…
…tes -- that will be a treat for map.resources. Deprecated the name route root as it'll be used as a shortcut for map.connect '' in Rails 2.0 (Rails 1.2). Added map.root as an alias for map.connect '' (Rails 2.0)

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ffb17e8
@dhh dhh Fixed script/process/spawner to work properly with Mongrel including …
…in -r (daemonize mode) [DHH]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5672 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
bd261ff
Commits on Dec 05, 2006
@jeremy jeremy Merge [5682] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5683 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
762fc54
Commits on Dec 06, 2006
@jeremy jeremy Merge [5685] from trunk. Closes #3811.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5686 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2876efb
@jeremy jeremy Include svn revision in changelogs.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5687 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8804b7a
@jeremy jeremy Merge [5689] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5690 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0c483d0
@jeremy jeremy Partially merge [5691] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5693 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3d5fb40
@jeremy jeremy Merge [5694]-[5698] from trunk: respond_to json and render :json => ...
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5699 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
67ac59a
Commits on Dec 10, 2006
@seckar seckar Apply [5710] to RC
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5712 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
590b192
Commits on Dec 12, 2006
@jeremy jeremy Merge [5715] from trunk. Closes #6699.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5716 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6df67f5
Commits on Dec 15, 2006
@NZKoz NZKoz merge plugin loading changes to 1.2 release
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5721 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
34bc074
Commits on Dec 16, 2006
@NZKoz NZKoz Merge [5722] to release
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5723 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
72d556a
Commits on Dec 17, 2006
@jeremy jeremy Merge [5728] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5729 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d5ca9a5
@jeremy jeremy Merge [5730] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5731 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0ae462a
Commits on Dec 18, 2006
@NZKoz NZKoz Merge plugin changes back to 1.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5739 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cda3d89
@jeremy jeremy Rollback accidental commit from [5686].
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5743 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
67cda1f
Commits on Dec 19, 2006
@technoweenie technoweenie apply [5744] to 1.2 pre-release
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5745 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fe2e51b
@jeremy jeremy Merge [5749],[5750],[5751] from trunk. References #6840.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5752 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c3c7648
@jeremy jeremy Merge [5753] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5754 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
498bca8
@jeremy jeremy Merge [5755] from trunk. Closes #6514, closes #6743.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5756 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6ccbef5
@jeremy jeremy Merge [5757] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5758 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c7e2b03
Commits on Dec 20, 2006
@jeremy jeremy Merge [5759] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5760 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a451fd1
@jeremy jeremy Merge [5761] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5762 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
4dcdf08
@jeremy jeremy Merge [5763] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5764 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8ec9f4d
Commits on Dec 21, 2006
@jeremy jeremy Merge [5746] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5765 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
debd9ea
Commits on Dec 24, 2006
@seckar seckar Apply [5781] and [5782] to RC
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5783 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
da8a896
Commits on Dec 25, 2006
@technoweenie technoweenie apply [5784] to 1.2 pre-release
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5787 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1fb2f21
@technoweenie technoweenie apply [5785] to 1.2 branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5788 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3054a74
Commits on Dec 26, 2006
@dhh dhh Apply [5740] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5789 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
4aa9335
@technoweenie technoweenie apply [5790] to 1.2 stable branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5791 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
df27fb8
Commits on Dec 27, 2006
@NZKoz NZKoz Ensure dynamic finders are anchored to the beginning of the method na…
…me to prevent them from firing accidentally. [bradediger]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5796 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
155dcff
@NZKoz NZKoz Apply doc fix to RC, closes #6522
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5798 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ce8e54e
@NZKoz NZKoz Merge nil fix for error_message_on to RC, closes #6884
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5800 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
59be73a
@technoweenie technoweenie apply [5801] to 1.2 stable branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5802 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
7269ee2
Commits on Dec 31, 2006
@seckar seckar Apply [5811] to RC
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5812 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0ff4ede
@dhh dhh Make RDoc not spew errors on install because of HTML comments in code…
… comments

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5813 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ba29222
@jeremy jeremy Merge [5814] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5815 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a4e70d3
Commits on Jan 01, 2007
@jeremy jeremy Merge [5816] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a68d1d3
@jeremy jeremy Missed additions from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5818 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
4870bec
@jeremy jeremy Missed additions from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b6af22e
@jeremy jeremy Merge [5820] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5821 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0120b22
@jeremy jeremy Tighten new_session option check.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5822 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6dc5756
@jeremy jeremy Merge [5824] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5825 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
bdd09f5
@jeremy jeremy Merge [5826] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5827 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b0303e1
@jamis jamis Make sure html_document is reset between integration test requests
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5829 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c26cca3
Commits on Jan 04, 2007
@technoweenie technoweenie apply [5833] to 1.2 RC branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5834 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
622d70a
@technoweenie technoweenie apply [5835] to 1.2 RC branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5836 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
21e4825
@technoweenie technoweenie rollback [5833] and [5835]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e9a7b23
Commits on Jan 05, 2007
@NZKoz NZKoz merge sybase changes to 1.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5840 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
83a21f7