e9a7b233f6b44abd9e50fb6e734f897ba9b3333a Michael Koziarski michael@koziarski.com http://github.com/aslakhellesoy/rails/commit/83a21f75cf518b7f50581041cfce038c196a56b5 83a21f75cf518b7f50581041cfce038c196a56b5

2007-01-04T16:16:54-08:00

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 7262142f87d03660a71f1153ccf516355bf3ecf8 Michael Koziarski michael@koziarski.com 21e4825596db063349f1b3637c5ced1f5cef4ae4 Rick Olson technoweenie@gmail.com http://github.com/aslakhellesoy/rails/commit/e9a7b233f6b44abd9e50fb6e734f897ba9b3333a e9a7b233f6b44abd9e50fb6e734f897ba9b3333a

2007-01-04T13:42:32-08:00

rollback [5833] and [5835] git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5837 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 8b18ee546f3d2d10d1a623eea0804a2df21dc25e Rick Olson technoweenie@gmail.com 622d70a11eb3e110682803509822e2bfb8a9d8bb Rick Olson technoweenie@gmail.com http://github.com/aslakhellesoy/rails/commit/21e4825596db063349f1b3637c5ced1f5cef4ae4 21e4825596db063349f1b3637c5ced1f5cef4ae4

2007-01-04T13:31:48-08:00

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 69ef507594cc562c223bd3cc52115654649f861a Rick Olson technoweenie@gmail.com c26cca3f458b07b144af15fb9ec9ad2b3319be5e Rick Olson technoweenie@gmail.com http://github.com/aslakhellesoy/rails/commit/622d70a11eb3e110682803509822e2bfb8a9d8bb 622d70a11eb3e110682803509822e2bfb8a9d8bb

2007-01-04T13:19:42-08:00

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 0f996307c7eae8d2f5a5df13dec1dd4556734c90 Rick Olson technoweenie@gmail.com b0303e1ac25c75836a8d2a733876d79e32884456 Jamis Buck jamis@37signals.com http://github.com/aslakhellesoy/rails/commit/c26cca3f458b07b144af15fb9ec9ad2b3319be5e c26cca3f458b07b144af15fb9ec9ad2b3319be5e

2006-12-31T19:04:23-08:00

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 8b18ee546f3d2d10d1a623eea0804a2df21dc25e Jamis Buck jamis@37signals.com bdd09f50f8f1fed99c23a0b6603b5549644aa0bc Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/b0303e1ac25c75836a8d2a733876d79e32884456 b0303e1ac25c75836a8d2a733876d79e32884456

2006-12-31T17:36:48-08:00

Merge [5826] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5827 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 57fb29f4c0b7a76c87331027e8ac183a8a39be06 Jeremy Kemper jeremy@bitsweat.net 6dc5756d395ac591ee3d3c6c7e8c45dc3c8ddabb Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/bdd09f50f8f1fed99c23a0b6603b5549644aa0bc bdd09f50f8f1fed99c23a0b6603b5549644aa0bc

2006-12-31T17:32:59-08:00

Merge [5824] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5825 5ecf4fe2-1ee6-0310-87b1-e25e094e27de e202ba94240bf6267f70a8d4b9dabb9636e5b2a3 Jeremy Kemper jeremy@bitsweat.net 0120b226ba3f91dba2e1e45b54fbef09844da8cf Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/6dc5756d395ac591ee3d3c6c7e8c45dc3c8ddabb 6dc5756d395ac591ee3d3c6c7e8c45dc3c8ddabb

2006-12-31T17:27:55-08:00

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 910c40320a5d83fd109d738e70c1dd18ba535bb2 Jeremy Kemper jeremy@bitsweat.net b6af22ec822ebda47827c17c24415e4a1b107637 Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/0120b226ba3f91dba2e1e45b54fbef09844da8cf 0120b226ba3f91dba2e1e45b54fbef09844da8cf

2006-12-31T17:14:02-08:00

Merge [5820] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5821 5ecf4fe2-1ee6-0310-87b1-e25e094e27de f544c7a00bd1d78517711b0c86808b23fc3c833f Jeremy Kemper jeremy@bitsweat.net 4870becaebdbb9e3a0280f7555a3815805f1d793 Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/b6af22ec822ebda47827c17c24415e4a1b107637 b6af22ec822ebda47827c17c24415e4a1b107637

2006-12-31T16:32:33-08:00

Missed additions from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5819 5ecf4fe2-1ee6-0310-87b1-e25e094e27de d496ded464f5b867622e5a44cad8f3776072d50f Jeremy Kemper jeremy@bitsweat.net a68d1d35f86da04290a501748b35d7d6b3bb6ef3 Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/4870becaebdbb9e3a0280f7555a3815805f1d793 4870becaebdbb9e3a0280f7555a3815805f1d793

2006-12-31T16:30:20-08:00

Missed additions from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5818 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 9755503c9c553fe6d5cf110d27fbe72b7df1dd4a Jeremy Kemper jeremy@bitsweat.net a4e70d3e91afd0e20576e6b24632cea0cf9c0f5f Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/a68d1d35f86da04290a501748b35d7d6b3bb6ef3 a68d1d35f86da04290a501748b35d7d6b3bb6ef3

2006-12-31T16:25:58-08:00

Merge [5816] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5817 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 6453832ff6ce19f496a65888248b7a977d5e3df5 Jeremy Kemper jeremy@bitsweat.net ba292228515abf355364403ec0862509d8da1f9b Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/a4e70d3e91afd0e20576e6b24632cea0cf9c0f5f a4e70d3e91afd0e20576e6b24632cea0cf9c0f5f

2006-12-31T15:54:28-08:00

Merge [5814] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5815 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 91c8cbd3bb36dc7c21506b81234e16831e0be1a1 Jeremy Kemper jeremy@bitsweat.net 0ff4ede7ca3fae4b1ee65354d37440603d2fa8bc David Heinemeier Hansson david@loudthinking.com http://github.com/aslakhellesoy/rails/commit/ba292228515abf355364403ec0862509d8da1f9b ba292228515abf355364403ec0862509d8da1f9b

2006-12-31T11:28:28-08:00

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 3642c9072ca006ffd8e41cd47e2b88e7bb23945e David Heinemeier Hansson david@loudthinking.com 7269ee2da98d33373e8f24b7ad932633a874db1f Nicholas Seckar nseckar@gmail.com http://github.com/aslakhellesoy/rails/commit/0ff4ede7ca3fae4b1ee65354d37440603d2fa8bc 0ff4ede7ca3fae4b1ee65354d37440603d2fa8bc

2006-12-31T10:59:58-08:00

Apply [5811] to RC git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5812 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 65884f9d17d204fea209765102d28863481fff84 Nicholas Seckar nseckar@gmail.com 59be73a1e71a0b15970b89a0ae98b416bd643cd0 Rick Olson technoweenie@gmail.com http://github.com/aslakhellesoy/rails/commit/7269ee2da98d33373e8f24b7ad932633a874db1f 7269ee2da98d33373e8f24b7ad932633a874db1f

2006-12-27T14:19:36-08:00

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 57a463858d8e1bbfeb1c61caad3e6f7a5a2b560f Rick Olson technoweenie@gmail.com ce8e54e2366fb129dd41866b3053d2865b8a9484 Michael Koziarski michael@koziarski.com http://github.com/aslakhellesoy/rails/commit/59be73a1e71a0b15970b89a0ae98b416bd643cd0 59be73a1e71a0b15970b89a0ae98b416bd643cd0

2006-12-27T12:47:20-08:00

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 d0eaa96e696d3bd453253329a18f158830ba7a76 Michael Koziarski michael@koziarski.com 155dcff431e65c6369353b30878208b631578764 Michael Koziarski michael@koziarski.com http://github.com/aslakhellesoy/rails/commit/ce8e54e2366fb129dd41866b3053d2865b8a9484 ce8e54e2366fb129dd41866b3053d2865b8a9484

2006-12-27T12:42:51-08:00

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 0a4fdbc194426f7f0160d6ac437757b5d86f1b63 Michael Koziarski michael@koziarski.com df27fb873c2b13bbe37cd07aa0818f2cf01a05c6 Michael Koziarski michael@koziarski.com http://github.com/aslakhellesoy/rails/commit/155dcff431e65c6369353b30878208b631578764 155dcff431e65c6369353b30878208b631578764

2006-12-27T12:39:48-08:00

Ensure dynamic finders are anchored to the beginning of the method name 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 13f5bf817db5b8f616926a76ce724939c4da4349 Michael Koziarski michael@koziarski.com 4aa93358fad9df6fd2f4f43aea0c0787443efe05 Rick Olson technoweenie@gmail.com http://github.com/aslakhellesoy/rails/commit/df27fb873c2b13bbe37cd07aa0818f2cf01a05c6 df27fb873c2b13bbe37cd07aa0818f2cf01a05c6

2006-12-26T11:41:08-08:00

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 bd42d15ef87c10ea1f10eb34035cc68a8315f088 Rick Olson technoweenie@gmail.com 3054a742df73a90fd3d558f1e1f473b46f224f75 David Heinemeier Hansson david@loudthinking.com http://github.com/aslakhellesoy/rails/commit/4aa93358fad9df6fd2f4f43aea0c0787443efe05 4aa93358fad9df6fd2f4f43aea0c0787443efe05

2006-12-26T10:00:43-08:00

Apply [5740] from trunk git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5789 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 9ccd6ff94e6c4e5bd53d817d29c3ecf5bba6bfc0 David Heinemeier Hansson david@loudthinking.com 1fb2f21d1a7776b972e9c828225c686c19e93326 Rick Olson technoweenie@gmail.com http://github.com/aslakhellesoy/rails/commit/3054a742df73a90fd3d558f1e1f473b46f224f75 3054a742df73a90fd3d558f1e1f473b46f224f75

2006-12-25T01:41:16-08:00

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 b1a27e5476763daa3898d153985419f45b45cb19 Rick Olson technoweenie@gmail.com da8a896d86e792f0f59bec8381cb162375b4c2b5 Rick Olson technoweenie@gmail.com http://github.com/aslakhellesoy/rails/commit/1fb2f21d1a7776b972e9c828225c686c19e93326 1fb2f21d1a7776b972e9c828225c686c19e93326

2006-12-25T01:37:06-08:00

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 5aef0fc142d9dc7ba9e1a50349432fff7e344d98 Rick Olson technoweenie@gmail.com debd9ea2ceada149db071f433c69bf136e3b4047 Nicholas Seckar nseckar@gmail.com http://github.com/aslakhellesoy/rails/commit/da8a896d86e792f0f59bec8381cb162375b4c2b5 da8a896d86e792f0f59bec8381cb162375b4c2b5

2006-12-24T07:19:04-08:00

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 c047a8febe7b999f861c3752b068501e4f47c669 Nicholas Seckar nseckar@gmail.com 8ec9f4d2a0059e94527a58c66b10779d525f6b7d Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/debd9ea2ceada149db071f433c69bf136e3b4047 debd9ea2ceada149db071f433c69bf136e3b4047

2006-12-21T11:30:27-08:00

Merge [5746] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5765 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 1cbfc9ad9d165d425a98ff2830bb4437d65d9773 Jeremy Kemper jeremy@bitsweat.net 4dcdf0834e5e3ec148cafe9dd51e3459d132076f Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/8ec9f4d2a0059e94527a58c66b10779d525f6b7d 8ec9f4d2a0059e94527a58c66b10779d525f6b7d

2006-12-20T13:29:43-08:00

Merge [5763] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5764 5ecf4fe2-1ee6-0310-87b1-e25e094e27de a35492a3bcb3ec3e082603a6352f905459f9af3c Jeremy Kemper jeremy@bitsweat.net a451fd1fbf4942ef15ba562f202e675e9663067e Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/4dcdf0834e5e3ec148cafe9dd51e3459d132076f 4dcdf0834e5e3ec148cafe9dd51e3459d132076f

2006-12-20T13:15:19-08:00

Merge [5761] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5762 5ecf4fe2-1ee6-0310-87b1-e25e094e27de e253c6693203a9fbd19dce90af8b98effa96638d Jeremy Kemper jeremy@bitsweat.net c7e2b0342409ec3e4bebe2887f723db48e47dc5a Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/a451fd1fbf4942ef15ba562f202e675e9663067e a451fd1fbf4942ef15ba562f202e675e9663067e

2006-12-20T10:40:46-08:00

Merge [5759] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5760 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 96c8a13deed8d1ea23d531cea7ed87386350c238 Jeremy Kemper jeremy@bitsweat.net 6ccbef586262b2340f45cafc9eb1668665a2a50d Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/c7e2b0342409ec3e4bebe2887f723db48e47dc5a c7e2b0342409ec3e4bebe2887f723db48e47dc5a

2006-12-19T15:17:43-08:00

Merge [5757] from trunk. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5758 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 0369b581e26d3784489ffb1a96e3bb318786a16d Jeremy Kemper jeremy@bitsweat.net 498bca8ae8d3c00f9f571ac947b5fb4bcc4d96f9 Jeremy Kemper jeremy@bitsweat.net http://github.com/aslakhellesoy/rails/commit/6ccbef586262b2340f45cafc9eb1668665a2a50d 6ccbef586262b2340f45cafc9eb1668665a2a50d

2006-12-19T12:27:35-08:00

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 0f269cd42056f76722c8e855e5d54e961dec5161 Jeremy Kemper jeremy@bitsweat.net