git clone git://github.com/rails/rails.git
Update prototype.js to [5985], fixes content-type issue with simulated HTTP methods
Update versions in preparation for Rails 1.2.1
Fix nodoc breaking adapters (closes #7161)
Keep the irrelevant stuff out with :nodoc:
Modernize cookie testing code, and increase coverage (Heckle++) #7101 [Kevin Clark]
Heckling ActionController::Resources::Resource revealed that set_prefixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]
Apply [5970] to 1.2 branch
Prepare for release of 1.2
[DOC] clear up some ambiguity with the way has_and_belongs_to_many creates the default join table name. #7072 [jeremymcanally]
Merge oracle fixes over to 1.2
Made sure that connections are only removed for SQLite
Merge [5944] from trunk. References #7048.
Merge [5937] from trunk. References #6956.
Merge [5935] from trunk. References #3987, #6664.
Merge [5933] from trunk. References #7000.
Calculations don't modify their options hash. References [5931], [5426], closes #6929.
Merge [5929] from trunk. References #6976.
Merge [5909], [5927] from trunk. References #6742, #7026.
Merge [5924] from trunk. References #7023.
Merge [5919] from trunk. References #7021.
Merge [5917] from trunk: unbundle flexmock.
Merge [5914] from trunk. References #7015.
Merge [5907] from trunk. References #6482.
Merge [5904] from trunk. References #6252.
Merge [5901], [5902], [5903] from trunk. References #6156.
Merge [5899] from trunk. References #6962.
Merge [5895], [5896] from trunk. References #6891.
Merge [5893] from trunk. References #2541.
Merge [5891] from trunk. References #6635.