Skip to content
This repository
  • 341 commits
  • 302 files changed
  • 0 comments
  • 9 contributors
This comparison is big! We're only showing the most recent 250 commits
Nov 26, 2006
Jeremy Kemper 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 Kemper 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
David Heinemeier Hansson 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
David Heinemeier Hansson 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 Kemper 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
David Heinemeier Hansson 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
Nov 27, 2006
Michael Koziarski 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
Michael Koziarski 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
Nov 28, 2006
Jeremy Kemper 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 Kemper 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
Nov 29, 2006
Jeremy Kemper 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
Nov 30, 2006
David Heinemeier Hansson 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
David Heinemeier Hansson 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
Dec 01, 2006
David Heinemeier Hansson 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
David Heinemeier Hansson 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 Kemper 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
David Heinemeier Hansson Wups
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5662 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
de3ec6c
Dec 03, 2006
David Heinemeier Hansson 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
David Heinemeier Hansson 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
Dec 04, 2006
David Heinemeier Hansson 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
David Heinemeier Hansson 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
Dec 05, 2006
Jeremy Kemper 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
Dec 06, 2006
Jeremy Kemper 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 Kemper 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 Kemper 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 Kemper 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 Kemper 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
Dec 10, 2006
Nicholas 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
Dec 12, 2006
Jeremy Kemper 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
Dec 15, 2006
Michael Koziarski 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
Dec 16, 2006
Michael Koziarski 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
Dec 17, 2006
Jeremy Kemper 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 Kemper 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
Dec 18, 2006
Michael Koziarski 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 Kemper 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
Dec 19, 2006
risk danger olson 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 Kemper 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 Kemper 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 Kemper 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 Kemper 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
Dec 20, 2006
Jeremy Kemper 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 Kemper 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 Kemper 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
Dec 21, 2006
Jeremy Kemper 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
Dec 24, 2006
Nicholas 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
Dec 25, 2006
risk danger olson 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
risk danger olson 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
Dec 26, 2006
David Heinemeier Hansson 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
risk danger olson 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
Dec 27, 2006
Michael Koziarski 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
Michael Koziarski 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
Michael Koziarski 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
risk danger olson 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
Dec 31, 2006
Nicholas 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
David Heinemeier Hansson 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 Kemper 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
Jan 01, 2007
Jeremy Kemper 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 Kemper 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 Kemper 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 Kemper 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 Kemper 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 Kemper 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 Kemper 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 Buck 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
Jan 04, 2007
risk danger olson 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
risk danger olson 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
risk danger olson 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
Jan 05, 2007
Michael Koziarski 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
David Heinemeier Hansson Applied [5845] from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5846 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fde811e
David Heinemeier Hansson Fixed that webrick would strip leading newlines and hang connection (…
…closes #4156) [psross]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5847 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
04383b9
David Heinemeier Hansson Fixing release notes for RC2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5848 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ab3f6bc
risk danger olson [DOCS] fix reference to ActionController::Macros::AutoComplete for #t…
…ext_field_with_auto_complete. Closes #2578 [Jan Prill]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5852 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
376dcb8
risk danger olson [DOCS] Document :allow_nil option of #validate_uniqueness_of. Closes #…
…3143 [Caio Chassot]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5854 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
382547d
risk danger olson [DOCS] Apply more documentation for ActiveRecord Reflection. Closes #…
…4055 [Robby Russell]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5856 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f1a4c44
risk danger olson Clean up multiple calls to #stringify_keys in TagHelper, add better d…
…ocumentation and testing for TagHelper. Closes #6394 [Bob Silva]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5858 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2c1d0e2
risk danger olson Add more extensive documentation to the AssetTagHelper. Closes #6452
…[Bob Silva]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5860 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1696c1f
risk danger olson Slight doc tweak to #prepend_filter. Closes #6493 [Jeremy Voorhis]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5861 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9cc2e0f
risk danger olson Slight doc tweak to the ActionView::Helpers::PrototypeHelper#replace …
…docs. Closes #6922 [Steven Bristol]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5864 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
de9ccd8
risk danger olson add application.js filter to fix failing asset tag helper test
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5865 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
25c3ee4
Michael Koziarski Merge oracle clob / serialize fix to 1.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5867 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e76eae6
Jan 07, 2007
Michael Koziarski Merge error_messages_on fix to 1.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5871 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5bf40f7
Jan 10, 2007
risk danger olson add some more detail on nested resource docs [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5878 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
398c1a5
Jan 11, 2007
risk danger olson merge [5718] to 1.2 branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5880 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
86f78cd
Jan 12, 2007
Jeremy Kemper Merge [5887] from trunk. References #4668.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5888 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fd2b14c
Jeremy Kemper Merge [5889] from trunk. References #6030.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5890 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0ac6b50
Jeremy Kemper Merge [5891] from trunk. References #6635.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5892 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f7d2595
Jeremy Kemper Merge [5893] from trunk. References #2541.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5894 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
34603e7
Jeremy Kemper Merge [5895], [5896] from trunk. References #6891.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5897 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1a7ce06
Jeremy Kemper Merge [5899] from trunk. References #6962.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5900 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
52923c9
Jeremy Kemper Merge [5901], [5902], [5903] from trunk. References #6156.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5905 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d12bcda
Jeremy Kemper Merge [5904] from trunk. References #6252.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5906 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
dd605e9
Jeremy Kemper Merge [5907] from trunk. References #6482.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5908 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
06c7584
Jan 13, 2007
Jeremy Kemper Merge [5914] from trunk. References #7015.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5915 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
18857ca
Jeremy Kemper Merge [5917] from trunk: unbundle flexmock.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5918 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8f84165
Jeremy Kemper Merge [5919] from trunk. References #7021.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5920 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
debaf20
Jan 14, 2007
Jeremy Kemper Merge [5924] from trunk. References #7023.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5925 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
68849e3
Jeremy Kemper Merge [5909], [5927] from trunk. References #6742, #7026.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5928 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2b6954a
Jeremy Kemper Merge [5929] from trunk. References #6976.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5930 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2d5bf4b
Jeremy Kemper Calculations don't modify their options hash. References [5931], [542…
…6], closes #6929.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5932 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5385859
Jan 15, 2007
Jeremy Kemper Merge [5933] from trunk. References #7000.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5934 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
143cc0e
Jeremy Kemper Merge [5935] from trunk. References #3987, #6664.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5936 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5f11417
Jeremy Kemper Merge [5937] from trunk. References #6956.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5938 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
aa30fc7
Jeremy Kemper Merge [5944] from trunk. References #7048.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5945 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5d0fd52
David Heinemeier Hansson Made sure that connections are only removed for SQLite
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5955 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
517628d
Jan 16, 2007
Michael Koziarski Merge oracle fixes over to 1.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5959 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d25ae9b
risk danger olson [DOC] clear up some ambiguity with the way has_and_belongs_to_many cr…
…eates the default join table name. #7072 [jeremymcanally]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5961 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cc99f3f
Jan 17, 2007
David Heinemeier Hansson Prepare for release of 1.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5968 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a3dafb0
Sam Stephenson Apply [5970] to 1.2 branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5971 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
81b94c2
risk danger olson Heckling ActionController::Resources::Resource revealed that set_pref…
…ixes didn't break when :name_prefix was munged. #7081 [Kevin Clark]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5975 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e9e86fd
risk danger olson Modernize cookie testing code, and increase coverage (Heckle++) #7101
…[Kevin Clark]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5978 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
025f895
Jan 18, 2007
David Heinemeier Hansson Keep the irrelevant stuff out with :nodoc:
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5980 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5c61b17
David Heinemeier Hansson Keep the irrelevant stuff out with :nodoc:
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5981 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cfb3a80
David Heinemeier Hansson Fix nodoc breaking adapters (closes #7161)
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5983 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f255db8
David Heinemeier Hansson Update versions in preparation for Rails 1.2.1
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5984 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3ec808e
Thomas Fuchs Update prototype.js to [5985], fixes content-type issue with simulate…
…d HTTP methods

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5987 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
03e763f
David Heinemeier Hansson Bump rails version too
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5989 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a182d85
Jan 23, 2007
Jeremy Kemper Merge [6014] from trunk. References #2928.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@6015 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
70f4a92
Jan 24, 2007
Jeremy Kemper Merge [6023] from trunk. References #7330.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@6024 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c9ed2f6
Jeremy Kemper Merge [5704], [6005], [6034] from trunk. References #7268, #7354.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@6035 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
553c23d
Jan 26, 2007
risk danger olson Require the dispatcher for Rails::Configuration#to_prepare. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@6041 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c28a70c
David Heinemeier Hansson stable becomes 1-1-stable, 1-2-pre-release becomes 1-2-stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6042 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fe42e6c
David Heinemeier Hansson Fixed NumberHelper#number_with_delimiter to use "." always for splitt…
…ing the original number, not the delimiter parameter (closes #7389) [ceefour]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6045 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
7e33de4
Jan 28, 2007
Jeremy Kemper Merge [6062] from trunk. References #7229.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6063 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
11a92b3
Jeremy Kemper Merge [6064] from trunk. References #6778.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6065 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d4b6671
Jeremy Kemper Merge [5434] from trunk. Reference #6495.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6066 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9b24e11
Jeremy Kemper Merge [6067] from trunk. References #6778.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6068 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1155252
Jeremy Kemper Merge [6071] from trunk. References #7095.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6072 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d6f6a41
Jeremy Kemper Merge [6075] from trunk. References #7228.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6077 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
4dc206c
Jeremy Kemper Merge [6078] from trunk. References #6977.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6079 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2bc5e6c
David Heinemeier Hansson Remove noisy nodoc for Ruby 1.8.4
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6083 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b79c0a0
Jeremy Kemper Merge [6084] from trunk. References #7083.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6085 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
57098ad
Jeremy Kemper Merge [6086] from trunk. References #7372.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6087 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
454842a
Jan 30, 2007
Jamis Buck When dealing with SQLite3, use the table_info pragma helper, so that …
…the bindings can do some translation for when sqlite3 breaks incompatibly between point releases.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6092 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
7571380
Jan 31, 2007
Michael Koziarski Deprecate server_settings renaming it to smtp_settings, add sendmail_…
…settings to allow you to override the arguments to and location of the sendmail executable. [Koz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6094 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6744e35
Feb 04, 2007
risk danger olson Add singleton resources from trunk [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6107 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ef3ffd1
risk danger olson Added :instance_writer option to #mattr_writer/accessor, #cattr_write…
…r/accessor, and #class_inheritable_writer to skip the creation of the instance writer. [Rick]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6108 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
58cb43c
risk danger olson Don't create instance writer methods for class attributes. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6109 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6a04f35
risk danger olson Optimize Class Inheritable Attributes so that unnecessary hashes are …
…not created. [Bruce Perens]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6112 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
86519a6
risk danger olson apply [6113] to stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6114 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
21fafdd
risk danger olson fix problem with EMPTY_INHERITABLE_ATTRIBUTES being redefined
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6116 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
92b00ef
risk danger olson Add much-needed html-scanner tests. Fixed CDATA parsing bug. [Rick]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6118 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0ee158a
David Heinemeier Hansson Fix gem deprecation warnings, which also means depending on RubyGems …
…0.9.0+ [Chad Fowler]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6119 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
c4d8d97
Michael Koziarski Merge 5876 to release.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6122 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
41108fe
David Heinemeier Hansson Update release script on stable branch
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6123 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ed6509c
David Heinemeier Hansson Prepare for release of Rails 1.2.2
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6124 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a422b8b
Feb 06, 2007
David Heinemeier Hansson Update date
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6131 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e73bdfc
Feb 08, 2007
Jeremy Kemper Merge [6140] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6141 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e41f489
Feb 10, 2007
Jeremy Kemper Merge [6143] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6144 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ae11519
Jeremy Kemper Revert [6086] and [6087] since they caused a major regression with fu…
…nctional tests in 1.2.2. References #7372.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6145 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d1b93e7
Feb 20, 2007
Michael Koziarski Stop swallowing errors during rake test [Koz]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6175 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f444374
Feb 26, 2007
Jeremy Kemper Merge [6241] from trunk.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ee31d64
Feb 27, 2007
risk danger olson apply [6248] to stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6250 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
742bee4
Jeremy Kemper Merge [6253] from trunk. References #6680.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6254 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9679cb4
Mar 02, 2007
Jeremy Kemper Merge [6099] from trunk. Compatibility with Ruby 1.8.6: make private …
…Time#to_date and #to_datetime public.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6281 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
bbe3dea
Mar 04, 2007
Jeremy Kemper Ruby 1.8.6 compatibility: the bundled mysql.rb had used deprecated Di…
…gest::SHA1.new(...).digest instead of Digest::SHA1.digest(...)

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6328 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
633d757
Jeremy Kemper Upgrade rake dependency from 0.7.1 to 0.7.2 to pull in its Ruby 1.8.6…
… compatibility fixes.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6329 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
579daf5
Mar 05, 2007
Jeremy Kemper Merge [6336] from trunk. References #6466, #7153.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6337 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b1e1088
Mar 06, 2007
Jeremy Kemper Merge [6344] from trunk. Check for MinGW when testing for Windows pla…
…tform. References #2982.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6345 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a9ed24c
Mar 09, 2007
Jeremy Kemper Merge [6360] from trunk. Fixes YAML Omap fixtures. References #2665.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6361 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
243cdde
Jeremy Kemper Merge [6364] from trunk. Consistently quote primary key column names.…
… References #7763.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6365 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
4a8d3d5
Mar 12, 2007
risk danger olson Apply [5709] to stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6390 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5552dad
David Heinemeier Hansson Prepare for release of Rails 1.2.3
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6395 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
736cca8
Mar 13, 2007
risk danger olson apply [6408] to stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6410 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3054971
David Heinemeier Hansson Use inline rubyforge automation
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6416 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1cd8257
David Heinemeier Hansson Monkey doc around in an attempt to please rdoc
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6417 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8ad39a0
David Heinemeier Hansson Only auto-push gems
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6418 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
91976d7
Mar 14, 2007
Jeremy Kemper Clarify changelog entries.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d10177d
Jeremy Kemper Merge [6422] from trunk. Undeprecates verification with :redirect_to …
…=> :named_route. References #7525.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6423 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
93d7ab4
Nicholas Seckar Merge [6426] to stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6428 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b41920d
Mar 16, 2007
Jeremy Kemper Merge [6431] from trunk. CGI::Session::Pstore performance. References #…
…7583.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6432 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
eefa0a2
Mar 18, 2007
Jeremy Kemper Merge [6445] from trunk. Consistently canonicalizes RAILS_ROOT on Win…
…dows and other platforms. References #6755.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6447 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
53c87f9
Jeremy Kemper Merge [6446] from trunk. Never return nil from read_params for compat…
…ibility with plain CGI query params parser. References #7581.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6448 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
98caf44
Mar 19, 2007
Jeremy Kemper Merge [6449] from trunk. Fixes SQLite binary encoding with utf8 kcode…
…. References #7862.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6450 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e05afb1
Mar 23, 2007
Jeremy Kemper Merge [6455] from trunk. Fix PStore typo. References #7900.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6456 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
24267c4
Mar 27, 2007
risk danger olson documentation project patches, closes #7342, #7319, #7316, #7190 [jer…
…emymcanally]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6471 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b564d7e
Apr 20, 2007
risk danger olson Return the string representation from an Xml Builder when rendering a…
… partial. #5044 [tpope]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6543 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e522f75
risk danger olson forgot to save changelog
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6544 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
67465f8
Apr 24, 2007
David Heinemeier Hansson Improved performance by relying less on exception raising #8159 [Blaine]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6571 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f5977b2
May 02, 2007
risk danger olson apply [6649] to stable, closes #8226 [Stefan Kaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6650 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cdc26bd
risk danger olson apply [6648] to 1.2 stable
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6651 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0fd9743
May 06, 2007
Michael Koziarski Apply prepend_before_filter bugfix from stefan.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6671 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d080638
Michael Koziarski fix actionpack tests broken by additional mocha methods
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6675 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d137167
Michael Koziarski Allow asset tag tests to pass on windows
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6676 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
92caa99
Michael Koziarski don't depend on the order of hash.inspect in assertions.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a74560f
Michael Koziarski Stop depending on strange platform specific rounding behaviour in the…
… number helper tests

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6680 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cfcc188
May 15, 2007
Jeremy Kemper Merge [6738] to stable: extract Oracle CHAR column length. References #…
…7866.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6739 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
173e2d2
May 18, 2007
Jeremy Kemper Merge [6775] to stable from trunk: observe_form always sends the seri…
…alized form. References #5271.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6776 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d4c24b6
May 19, 2007
Jeremy Kemper Merge [6787] to stable from trunk: document caches_action. References #…
…5419.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6788 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
bed591c
Jeremy Kemper Revert [4706] which added incorrect docs. References #5684.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6789 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
75bf71d
Jeremy Kemper Merge [6790] to stable from trunk: document deep eager includes. Refe…
…rences #6267.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6791 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6ba8d87
May 20, 2007
Jeremy Kemper Merge [6793] to stable from trunk: document Object#blank?. References #…
…6491.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6794 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
788d4b0
May 21, 2007
Jeremy Kemper Merge [6796] to stable from trunk. Integration tests: alias xhr to xm…
…l_http_request and add a request_method argument instead of always using POST. References #7124.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6797 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
07f92e8
risk danger olson merge [6798] into stable.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6799 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b14378c
risk danger olson forgot binary fixture
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6800 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e5590d6
Jeremy Kemper Merge [6802] to stable: fix filtered parameter logging with nil param…
…eter values. References #8422.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6803 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
099c206
May 22, 2007
Jeremy Kemper Merge [6804] to stable: belongs_to assignment creates a new proxy rat…
…her than modifying its target in-place. References #8412.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6805 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3ad1a98
May 27, 2007
Jeremy Kemper Add Active Resource to rails:freeze:edge and drop Action Web Service.…
… Closes #8205.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6872 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fe3fefe
May 28, 2007
risk danger olson apply [6879] to stable. Closes #7293.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6880 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d5950cd
May 29, 2007
Michael Koziarski Fix template compile tests on windows [skaes] closes #8234
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6895 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1f5a264
Jun 11, 2007
Jeremy Kemper Deprecate pagination for Rails 1.2.4. Install the classic_pagination …
…plugin for forward compatibility, or move to the superior will_paginate plugin. References #8157.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@6993 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9c0e4de
Jeremy Kemper Merge [7002] to stable: fix syntax error in dispatcher than wrecked f…
…ailsafe responses. References #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7003 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
74191ed
Jun 12, 2007
Jeremy Kemper Merge [7006] to stable: fix precedence error in failsafe rescue. Refe…
…rences #8625.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7007 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5c6a0d5
Jun 13, 2007
Jeremy Kemper 1-2-stable: changing the :default Date format doesn't break date quot…
…ing. Closes #6312.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7012 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2ba8864
Jun 21, 2007
Jeremy Kemper Merge [7075] to stable: save associated records only if the associati…
…on is already loaded. References #8713.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7076 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
7d517a1
Jun 23, 2007
Jeremy Kemper Merge [7086] to stable: demote Hash#to_xml to use XmlSimple#xml_in_st…
…ring so it can't read files or stdin. References #8453.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7087 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
b29caa5
Jul 01, 2007
Michael Koziarski Merge delete-with-options for cookies from trunk to release
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7161 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d81ac8d
Jul 11, 2007
Michael Koziarski Merge [7177] to release. [skaes] References #8891
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7178 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
40a188b
Jul 14, 2007
Michael Koziarski Improve performance of action caching. Closes #8231 [skaes]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7185 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e3670a0
Aug 05, 2007
Michael Koziarski Merge gem freezing fix to stable.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7277 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6cc01c9
Aug 15, 2007
Michael Koziarski Integration tests: introduce methods for other HTTP methods. Closes #…
…6353.  Merges [6203]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7319 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
631bf6b
Michael Koziarski Ensure TestRequest#request_uri returns the right value when doing mul…
…tiple GETs. Closes #4867 [alisdair@randomoracle.org, mpalmer]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7320 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
2503fd3
Aug 16, 2007
Michael Koziarski Merge [7235] to stable. References #9167 [danger]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7327 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e0fd18b
Michael Koziarski Don't clobber :includes passed to count on has_many association. Closes
#9175 [danger]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7328 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1dd0034
Aug 20, 2007
Michael Koziarski Merge 8801 fix to stable. Closes #8801
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7347 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
19dff14
Sep 06, 2007
Added new new_admin_products_url named route in addition to old admin…
…_new_products_url syntax. latter syntax got a deprecation warning [pixeltrix]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7414 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3acd2bd
Sep 23, 2007
Jeremy Kemper Revert [7414] which rearranged stable resource URLs. References #8558.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7600 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
8943da4
Oct 01, 2007
Michael Koziarski Silence mocha warnings
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7703 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
fe1ee81
Michael Koziarski Merge sqlite test fixes from trunk
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7706 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a11dc68
Michael Koziarski Change the resource seperator from ; to / change the generated routes…
… to use the new-style named routes. e.g. new_group_user_path(@group) instead of group_new_user_path(@group). [pixeltrix] Closes #8558

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7713 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
779db44
Oct 02, 2007
Michael Koziarski Disable non-cookie sessions to prevent Session Fixation Attacks. Closes
#7952 [bradediger]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7720 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
6c77370
Michael Koziarski Forgotten changelog entry
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7721 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
70a8e6a
Oct 03, 2007
Michael Koziarski Merge rake routes to stable to help people upgrading.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7730 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0a2404f
Oct 04, 2007
Michael Koziarski Actually add the file referenced in [7730]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7737 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a134f8f
Oct 05, 2007
David Heinemeier Hansson Update versions for release
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7740 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
ebe8bc3
Michael Koziarski Ensure json tests run in stable.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7747 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
4c458f8
Oct 08, 2007
Jeremy Kemper Fix in place editor's setter action with non-string fields. References
…#7418.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7783 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d868c9a
Jeremy Kemper Create layout dir it's nested. Closes #9272 [alancfrancis]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7785 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
0b45b89
Jeremy Kemper Move custom inflections example so available before route generation.…
… Closes #6829.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7786 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
16fde4c
Michael Koziarski Improve README documentation. Closes #8770 [mikel]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7797 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
52aeab4
Jeremy Kemper Fix unescaped test expectations. Closes #9821 [mikel]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7806 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5e281e9
Oct 09, 2007
Michael Koziarski Make sure acts_as_list's remove_from_list and in_list? play nicely wi…
…th one another. Closes #8822 [mikel]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7815 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1d5d050
Oct 10, 2007
Michael Koziarski Fix tests broken by earlier change
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7821 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
3397839
Michael Koziarski Add deprecation warning for calling .create on has_many associations …
…with an unsaved owner.

Fix regression introduced by [7076] by restoring 1.2.3 behaviour for saving associated records [Bryan Helmkamp].  References #8713


git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7823 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a692432
Oct 11, 2007
Jeremy Kemper Correct RAILS_GEM_VERSION regexp. Use =version gem requirement instea…
…d of ~>version so you don't get surprised by a beta gem in production. This change means upgrading to 1.2.5 will require a boot.rb upgrade.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7832 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e085270
Jeremy Kemper Backport: allow array and hash query parameters. Array route paramete…
…rs are converted/to/a/path as before. Closes #7047.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7834 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
88f2284
Michael Koziarski Backport fix to allow :controller=>:some_symbol [norbert]
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7838 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f70b74a
Oct 12, 2007
David Heinemeier Hansson Update versions for release
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7841 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d201969
David Heinemeier Hansson Mark for release now
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7844 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
a2f0af2
Oct 16, 2007
Jeremy Kemper Fix regression where the association would not construct new finder S…
…QL on save causing bogus queries for "WHERE owner_id = NULL" even after owner was saved. References #8713.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7940 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
257d860
Oct 20, 2007
risk danger olson merge [7978] from edge
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@7979 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5285270
Oct 27, 2007
Jeremy Kemper Fix has_many :through delete with custom foreign keys. References #6466.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8042 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1117d73
Jeremy Kemper Missed svn adds for [8042]. References #6466.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8044 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
cf3e966
Jeremy Kemper Merge [8046] from trunk: allow association redefinition in subclasses…
…. References #9346.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8048 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
65539c9
Nov 21, 2007
Michael Koziarski Merge [8176] to stable to fix session fixation attacks. Closes #10048
…[theflow, Koz]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8177 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
63e9687
Nov 24, 2007
Michael Koziarski Prepare for 1.2.6
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8195 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
d421bb9
Michael Koziarski Forgot railties changelog
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8196 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
9c19009
Dec 09, 2007
Jeremy Kemper Merge [8336] from trunk: update rails:freeze:gems to work with RubyGe…
…ms 0.9.5.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8337 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
1878f6c
Dec 10, 2007
Jeremy Kemper Merge [8355] from trunk: fix strange NoMemoryError on amd64. References
#10442 [wrb]

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8356 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
e85fcc0
Feb 02, 2008
Jeremy Kemper Merge r8782 from trunk: TestSession supports indifferent access. Refe…
…rences #7372.

git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8784 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
f756bfb
Feb 19, 2008
Jeremy Kemper Remove wasteful signal trap from transactions. Backport from 2-0-stable.
git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-stable@8895 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
5b3f756