025f8954157b685c35ad00599d66730ce9a6e1aa David Heinemeier Hansson david@loudthinking.com http://github.com/rubyruy/rails/commit/5988aaa50e72643b021ec5e8562d14a39b4f54e1 5988aaa50e72643b021ec5e8562d14a39b4f54e1 2007-01-17T23:18:33-08:00 2007-01-17T23:18:33-08:00 Tagged Rails 1.2.0 git-svn-id: http://svn-commit.rubyonrails.org/rails/tags/rel_1-2-0@5982 5ecf4fe2-1ee6-0310-87b1-e25e094e27de db05ee65981ff4ddf0079c96ee676084664fcf96 David Heinemeier Hansson david@loudthinking.com e9e86fd134e363c487cb8501fbebe7881bcf422a Rick Olson technoweenie@gmail.com http://github.com/rubyruy/rails/commit/025f8954157b685c35ad00599d66730ce9a6e1aa 025f8954157b685c35ad00599d66730ce9a6e1aa 2007-01-16T22:53:08-08:00 2007-01-16T22:53:08-08:00 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 1a842a94a0bb8052ad31786620943fdfe8328cc5 Rick Olson technoweenie@gmail.com 81b94c2f106f615eaca40b14e1c6ef150a56319c Rick Olson technoweenie@gmail.com http://github.com/rubyruy/rails/commit/e9e86fd134e363c487cb8501fbebe7881bcf422a e9e86fd134e363c487cb8501fbebe7881bcf422a 2007-01-16T22:47:51-08:00 2007-01-16T22:47:51-08:00 Heckling ActionController::Resources::Resource revealed that set_prefixes 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 50355bd28c5b328a9fc1c4f10c6dbbbb5ba74913 Rick Olson technoweenie@gmail.com a3dafb07ec64d3ae7f4fe1becf3b51105901418e Sam Stephenson sam@37signals.com http://github.com/rubyruy/rails/commit/81b94c2f106f615eaca40b14e1c6ef150a56319c 81b94c2f106f615eaca40b14e1c6ef150a56319c 2007-01-16T21:05:17-08:00 2007-01-16T21:05:17-08:00 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 5c9c96596f2b3c938d8f05489195c303fd742e9f Sam Stephenson sam@37signals.com cc99f3fc188405a51d4e9d93002b5dc2ee473a3d David Heinemeier Hansson david@loudthinking.com http://github.com/rubyruy/rails/commit/a3dafb07ec64d3ae7f4fe1becf3b51105901418e a3dafb07ec64d3ae7f4fe1becf3b51105901418e 2007-01-16T20:41:02-08:00 2007-01-16T20:41:02-08:00 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 a7910eee753fd148fb9da97d9f8f1ffaa2601fa0 David Heinemeier Hansson david@loudthinking.com d25ae9b6e1a20f4f2c10b8a70478423b3e7980a6 Rick Olson technoweenie@gmail.com http://github.com/rubyruy/rails/commit/cc99f3fc188405a51d4e9d93002b5dc2ee473a3d cc99f3fc188405a51d4e9d93002b5dc2ee473a3d 2007-01-15T22:31:53-08:00 2007-01-15T22:31:53-08:00 [DOC] clear up some ambiguity with the way has_and_belongs_to_many creates 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 c7d0ef452421ba8af87edd1f8dfa57a064be4472 Rick Olson technoweenie@gmail.com 517628d028222199978587620ca1735607b02f2e Michael Koziarski michael@koziarski.com http://github.com/rubyruy/rails/commit/d25ae9b6e1a20f4f2c10b8a70478423b3e7980a6 d25ae9b6e1a20f4f2c10b8a70478423b3e7980a6 2007-01-15T17:41:52-08:00 2007-01-15T17:41:52-08:00 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 0ae2e290414cfe4a9c1700013d892769c043231d Michael Koziarski michael@koziarski.com 5d0fd52305e371c3ace085b8e1cac71ef6c14ede David Heinemeier Hansson david@loudthinking.com http://github.com/rubyruy/rails/commit/517628d028222199978587620ca1735607b02f2e 517628d028222199978587620ca1735607b02f2e 2007-01-15T14:12:40-08:00 2007-01-15T14:12:40-08:00 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 3672afc85f66e99ac16cb1fbf12991647ab91b90 David Heinemeier Hansson david@loudthinking.com aa30fc7914e832cde02be4f628f4cd7a72ffea6d Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/5d0fd52305e371c3ace085b8e1cac71ef6c14ede 5d0fd52305e371c3ace085b8e1cac71ef6c14ede 2007-01-15T07:51:54-08:00 2007-01-15T07:51:54-08:00 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 9a3fc056e5252868b0579ddaeebd43b66c2c940d Jeremy Kemper jeremy@bitsweat.net 5f114177ce06ecfaa3d2e5169b8d7606ad3ea751 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/aa30fc7914e832cde02be4f628f4cd7a72ffea6d aa30fc7914e832cde02be4f628f4cd7a72ffea6d 2007-01-14T18:26:06-08:00 2007-01-14T18:26:06-08:00 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 c229864f97352e3883ef486b6a04b5cecc0974d4 Jeremy Kemper jeremy@bitsweat.net 143cc0ec2fe0a30556db32253ed09079a642900e Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/5f114177ce06ecfaa3d2e5169b8d7606ad3ea751 5f114177ce06ecfaa3d2e5169b8d7606ad3ea751 2007-01-14T17:28:22-08:00 2007-01-14T17:28:22-08:00 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 3ea3cceef5da6986e578c7a8addbbd43f0f29fab Jeremy Kemper jeremy@bitsweat.net 5385859dcf26cd4f0e934f16f390a37aae76afda Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/143cc0ec2fe0a30556db32253ed09079a642900e 143cc0ec2fe0a30556db32253ed09079a642900e 2007-01-14T16:36:04-08:00 2007-01-14T16:36:04-08:00 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 3396d2d088911190cf7135209cf6b4ad34a98b0c Jeremy Kemper jeremy@bitsweat.net 2d5bf4bbed92c079cbd68d196b49d227782e0191 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/5385859dcf26cd4f0e934f16f390a37aae76afda 5385859dcf26cd4f0e934f16f390a37aae76afda 2007-01-14T08:22:33-08:00 2007-01-14T08:22:33-08:00 Calculations don't modify their options hash. References [5931], [5426], closes #6929. git-svn-id: http://svn-commit.rubyonrails.org/rails/branches/1-2-pre-release@5932 5ecf4fe2-1ee6-0310-87b1-e25e094e27de 978e9a30d2648dda97d84053eafb458717ba5adb Jeremy Kemper jeremy@bitsweat.net 2b6954aa8a7175c4f2ea36c9df8586301c4051a6 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/2d5bf4bbed92c079cbd68d196b49d227782e0191 2d5bf4bbed92c079cbd68d196b49d227782e0191 2007-01-14T07:20:52-08:00 2007-01-14T07:20:52-08:00 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 40611f635234eae60db3ae5cdc938d07e357e1b5 Jeremy Kemper jeremy@bitsweat.net 68849e3239f1e363da02e6ffd3457f281167de4a Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/2b6954aa8a7175c4f2ea36c9df8586301c4051a6 2b6954aa8a7175c4f2ea36c9df8586301c4051a6 2007-01-14T06:44:03-08:00 2007-01-14T06:44:03-08:00 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 8ba95d82cee7162653ec704dc1625be28450b4f0 Jeremy Kemper jeremy@bitsweat.net debaf2080332672bbdeb0ac42bf946602ef00d63 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/68849e3239f1e363da02e6ffd3457f281167de4a 68849e3239f1e363da02e6ffd3457f281167de4a 2007-01-14T04:20:52-08:00 2007-01-14T04:20:52-08:00 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 6a4c39a1265e82f89852c169209a14104493f2b4 Jeremy Kemper jeremy@bitsweat.net 8f84165cb4fbe79760bedc0adea6cdbe2ca4c8c3 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/debaf2080332672bbdeb0ac42bf946602ef00d63 debaf2080332672bbdeb0ac42bf946602ef00d63 2007-01-13T00:07:15-08:00 2007-01-13T00:07:15-08:00 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 2fa50371b7521fb9bfdc683020955e9d933002a2 Jeremy Kemper jeremy@bitsweat.net 18857ca2cb1a6ad05bfb4a3b21e3b170b7955159 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/8f84165cb4fbe79760bedc0adea6cdbe2ca4c8c3 8f84165cb4fbe79760bedc0adea6cdbe2ca4c8c3 2007-01-12T23:17:14-08:00 2007-01-12T23:17:14-08:00 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 2df7507ab85c0fc4ad5cabf3da03db9429a16382 Jeremy Kemper jeremy@bitsweat.net 06c7584fba5e1e41160a5340e211df39d91e35bb Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/18857ca2cb1a6ad05bfb4a3b21e3b170b7955159 18857ca2cb1a6ad05bfb4a3b21e3b170b7955159 2007-01-12T20:10:18-08:00 2007-01-12T20:10:18-08:00 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 5ea44f7caf814417e9e4541d25b889068da1a260 Jeremy Kemper jeremy@bitsweat.net dd605e937fcbe9b764fda8e0245946d0ce177845 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/06c7584fba5e1e41160a5340e211df39d91e35bb 06c7584fba5e1e41160a5340e211df39d91e35bb 2007-01-12T02:19:12-08:00 2007-01-12T02:19:12-08:00 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 18c21005a4fff6021957f726d93e63f01c8021d7 Jeremy Kemper jeremy@bitsweat.net d12bcdac9d62497fa1b3130083de69d156bd7e6c Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/dd605e937fcbe9b764fda8e0245946d0ce177845 dd605e937fcbe9b764fda8e0245946d0ce177845 2007-01-12T01:13:05-08:00 2007-01-12T01:13:05-08:00 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 8bce48cd1ba8adda2a33e4ffeef9f4f9e2b25641 Jeremy Kemper jeremy@bitsweat.net 52923c9b5577fe2450cffc641ddbd9a8d6778351 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/d12bcdac9d62497fa1b3130083de69d156bd7e6c d12bcdac9d62497fa1b3130083de69d156bd7e6c 2007-01-12T01:12:28-08:00 2007-01-12T01:12:28-08:00 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 7a24647ed7c3864ce5ba8d4bf7dd264b2288eb99 Jeremy Kemper jeremy@bitsweat.net 1a7ce06e90b83d10fb57f30086a9ebec726febfd Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/52923c9b5577fe2450cffc641ddbd9a8d6778351 52923c9b5577fe2450cffc641ddbd9a8d6778351 2007-01-11T23:34:09-08:00 2007-01-11T23:34:09-08:00 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 3ce0bf6720bf28383290255c0700ce8cc43a2dc4 Jeremy Kemper jeremy@bitsweat.net 34603e7faf1880b1c7d1d4c9e064403ecfdef7fb Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/1a7ce06e90b83d10fb57f30086a9ebec726febfd 1a7ce06e90b83d10fb57f30086a9ebec726febfd 2007-01-11T23:04:53-08:00 2007-01-11T23:04:53-08:00 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 9a69937cb992174332c548656ac05744f8dda071 Jeremy Kemper jeremy@bitsweat.net f7d25950f054b7d9bf49cd42f388baff61e03373 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/34603e7faf1880b1c7d1d4c9e064403ecfdef7fb 34603e7faf1880b1c7d1d4c9e064403ecfdef7fb 2007-01-11T22:28:51-08:00 2007-01-11T22:28:51-08:00 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 ff686623e95e1110505611129cdc4dafc4ede6d7 Jeremy Kemper jeremy@bitsweat.net 0ac6b5077fd4a62d9e5c36be38c40abba1a976d2 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/f7d25950f054b7d9bf49cd42f388baff61e03373 f7d25950f054b7d9bf49cd42f388baff61e03373 2007-01-11T21:45:31-08:00 2007-01-11T21:45:31-08:00 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 89605a25826daa5380bf092fdbaf03bf62eb0063 Jeremy Kemper jeremy@bitsweat.net fd2b14c0462231eb624f4047bf3f0a8af6c560e7 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/0ac6b5077fd4a62d9e5c36be38c40abba1a976d2 0ac6b5077fd4a62d9e5c36be38c40abba1a976d2 2007-01-11T21:36:43-08:00 2007-01-11T21:36:43-08:00 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 7296b31ee19f342941e313129ec70f3624336b41 Jeremy Kemper jeremy@bitsweat.net 86f78cd8b625d25bd73b17292e654fb701f11fa5 Jeremy Kemper jeremy@bitsweat.net http://github.com/rubyruy/rails/commit/fd2b14c0462231eb624f4047bf3f0a8af6c560e7 fd2b14c0462231eb624f4047bf3f0a8af6c560e7 2007-01-11T21:24:07-08:00 2007-01-11T21:24:07-08:00 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 43bbb220cae183c4a82196304427aa82ef3bd28f Jeremy Kemper jeremy@bitsweat.net 398c1a504c75f48e60dcf4daf3e705064ad1c4e2 Rick Olson technoweenie@gmail.com http://github.com/rubyruy/rails/commit/86f78cd8b625d25bd73b17292e654fb701f11fa5 86f78cd8b625d25bd73b17292e654fb701f11fa5 2007-01-11T08:29:44-08:00 2007-01-11T08:29:44-08:00 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 73eb601754c8688c23d5e71a77372be21841e702 Rick Olson technoweenie@gmail.com 5bf40f7b79338e0a644bcf20e0fa8fd45472c5b1 Rick Olson technoweenie@gmail.com http://github.com/rubyruy/rails/commit/398c1a504c75f48e60dcf4daf3e705064ad1c4e2 398c1a504c75f48e60dcf4daf3e705064ad1c4e2 2007-01-10T10:10:44-08:00 2007-01-10T10:10:44-08:00 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 6ddc17298d83461bf7993689dc7f0c71f1990d84 Rick Olson technoweenie@gmail.com