20fd63f05d75d10f8a6afc54c2295da259d89f78 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 2008-10-11T21:24:54-07:00 2008-10-11T21:24:54-07:00 Since intention/option comment behind workers respawn in -k are not clear, do not let killing master with -k for now. db5f0e921e84d1d7d1bab1c5ba09f373823f7943 Michael S. Klishin michael@novemberain.com 2d721c48372e8aaf85b5b6c4b653b83df0402915 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/20fd63f05d75d10f8a6afc54c2295da259d89f78 20fd63f05d75d10f8a6afc54c2295da259d89f78 2008-10-11T20:58:20-07:00 2008-10-11T20:58:20-07:00 (put my Frankenstein voice on) It's alive! 3a9822e7340c15f2c8eaeea43dbd864d98cd119c Michael S. Klishin michael@novemberain.com a68e147e759021d2e6ab1bd0e2d89fe4d9b1c2a1 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/2d721c48372e8aaf85b5b6c4b653b83df0402915 2d721c48372e8aaf85b5b6c4b653b83df0402915 2008-10-11T07:49:52-07:00 2008-10-11T07:49:52-07:00 Merge upstream, re-apply stash. 0fa3912b71ee6f8d5266b56fc69b28848a7aa1f6 Michael S. Klishin michael@novemberain.com 94e9ff04eb037495ade4d7bd10dd4e3bb540e637 dad0d934c0294e082d7dc525e61ed547daf4bf64 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a68e147e759021d2e6ab1bd0e2d89fe4d9b1c2a1 a68e147e759021d2e6ab1bd0e2d89fe4d9b1c2a1 2008-10-11T07:46:29-07:00 2008-10-11T07:46:29-07:00 Merge branch 'sprint' * sprint: Updated GemManagement 2e9e0af214840be9b94251d3bf327e8640b3de39 Michael S. Klishin michael@novemberain.com a7fb18c7f3cf24321ccd8a8e03f6ddafcb6be651 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/dad0d934c0294e082d7dc525e61ed547daf4bf64 dad0d934c0294e082d7dc525e61ed547daf4bf64 2008-10-11T06:37:28-07:00 2008-10-11T06:37:28-07:00 Updated GemManagement 2e9e0af214840be9b94251d3bf327e8640b3de39 Fabien Franzen info@atelierfabien.be cc0e6ddec4437027e039731b96242995050f069e a7fb18c7f3cf24321ccd8a8e03f6ddafcb6be651 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/94e9ff04eb037495ade4d7bd10dd4e3bb540e637 94e9ff04eb037495ade4d7bd10dd4e3bb540e637 2008-10-11T00:06:11-07:00 2008-10-11T00:06:11-07:00 Merge branch 'sprint' daf87dba7c130400dbf16edcb8313bc2125537c1 Yehuda Katz wycats@gmail.com 5e4a862e856bd0a5b90deebbf2be3340a8955b6a d425060afd09ba313ae5fba3568029106009abf8 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a7fb18c7f3cf24321ccd8a8e03f6ddafcb6be651 a7fb18c7f3cf24321ccd8a8e03f6ddafcb6be651 2008-10-11T00:06:01-07:00 2008-10-11T00:06:01-07:00 Merge commit 'adelcambre/sprint' into sprint daf87dba7c130400dbf16edcb8313bc2125537c1 Yehuda Katz wycats@gmail.com d4917e085ab21bd15ec1960745f0e5e3449a16aa Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/d425060afd09ba313ae5fba3568029106009abf8 d425060afd09ba313ae5fba3568029106009abf8 2008-10-11T00:00:50-07:00 2008-10-11T00:00:50-07:00 remove the route method from specs 71d34c974db790a3941b7138810216ff8de5f478 Andy Delcambre adelcambre@engineyard.com c9054d2c03f5daacce44aaedf225e23c9c1ee48f Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/d4917e085ab21bd15ec1960745f0e5e3449a16aa d4917e085ab21bd15ec1960745f0e5e3449a16aa 2008-10-10T23:53:57-07:00 2008-10-10T23:53:57-07:00 crap, stray non-comment 03245f960dfd096a338afd7bb5c6046da9f37337 Andy Delcambre adelcambre@engineyard.com 38fc48a694d9dc3eb755f4b461f2dadb4de32c9b Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/c9054d2c03f5daacce44aaedf225e23c9c1ee48f c9054d2c03f5daacce44aaedf225e23c9c1ee48f 2008-10-10T23:38:33-07:00 2008-10-10T23:38:33-07:00 Revert "Move most merb logger code out, into extlib" This reverts commit 7a73c146dd28f4456b7ef2d1819834c67e04fa2a. c5846dac16e8e081389f38a306757a3355c415ae Andy Delcambre adelcambre@engineyard.com 1c01aa36a766874102d8deeb8b481046656b7753 5e4a862e856bd0a5b90deebbf2be3340a8955b6a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/cc0e6ddec4437027e039731b96242995050f069e cc0e6ddec4437027e039731b96242995050f069e 2008-10-10T23:28:07-07:00 2008-10-10T23:28:07-07:00 Merge branch 'sprint' 041ae9dc15a74b2c02e7a1fffdd2c84a6a35245b Yehuda Katz wycats@gmail.com 284933f51f42df41d2ddf42092f925f247640751 38fc48a694d9dc3eb755f4b461f2dadb4de32c9b Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5e4a862e856bd0a5b90deebbf2be3340a8955b6a 5e4a862e856bd0a5b90deebbf2be3340a8955b6a 2008-10-10T23:27:59-07:00 2008-10-10T23:27:59-07:00 Merge commit 'adelcambre/sprint' into sprint 041ae9dc15a74b2c02e7a1fffdd2c84a6a35245b Yehuda Katz wycats@gmail.com 284933f51f42df41d2ddf42092f925f247640751 1d8fc893991eac80f469658f0745a3f55df98191 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/1c01aa36a766874102d8deeb8b481046656b7753 1c01aa36a766874102d8deeb8b481046656b7753 2008-10-10T23:16:41-07:00 2008-10-10T23:16:41-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 79533e4af6697d973e992061e9acd9839cd33ae7 Yehuda Katz wycats@gmail.com 5737a09475cf06a0ac21789bb3091bf3f2372dde Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/284933f51f42df41d2ddf42092f925f247640751 284933f51f42df41d2ddf42092f925f247640751 2008-10-10T23:16:22-07:00 2008-10-10T23:16:22-07:00 Fixes given again 0613c9dec643d50881ab2e71a40bb92bb7eab64b Yehuda Katz wycats@gmail.com a1ddda3421f6381a2f7240cbd614377e06c42a8f db7c1a2c728b9d5aad57da900391195252a023ab Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/38fc48a694d9dc3eb755f4b461f2dadb4de32c9b 38fc48a694d9dc3eb755f4b461f2dadb4de32c9b 2008-10-10T23:02:49-07:00 2008-10-10T23:02:49-07:00 Merge commit 'mtodd/master' Conflicts: lib/merb-core/dispatch/router.rb lib/merb-core/dispatch/router/behavior.rb lib/merb-core/rack/helpers.rb 20644d35970f5d9521ae6684d35146dbe64be65f Andy Delcambre adelcambre@engineyard.com 457c28237b6f870a815b228f1d7339c76b05e5da 1d8fc893991eac80f469658f0745a3f55df98191 Matt Todd chiology@gmail.com http://github.com/wycats/merb-core/commit/db7c1a2c728b9d5aad57da900391195252a023ab db7c1a2c728b9d5aad57da900391195252a023ab 2008-10-10T22:53:05-07:00 2008-10-10T22:53:05-07:00 Merge branch 'master' of git://github.com/wycats/merb-core 45a050c1f404441b2dcbc4c1f277980b93840c1b Matt Todd chiology@gmail.com 19a3402711af8eaa1a4a706b951308e24ea8d1e9 Matt Todd chiology@gmail.com http://github.com/wycats/merb-core/commit/457c28237b6f870a815b228f1d7339c76b05e5da 457c28237b6f870a815b228f1d7339c76b05e5da 2008-10-10T22:52:56-07:00 2008-10-10T22:52:56-07:00 Added docuemntation for the Router and the Router::Behavior and Router::Proxy. bab20e82f8d221060a9f692c35e3790b29b5ac08 Matt Todd chiology@gmail.com d4003c983169052551eb884f456600fc826bfa55 Matt Todd chiology@gmail.com http://github.com/wycats/merb-core/commit/19a3402711af8eaa1a4a706b951308e24ea8d1e9 19a3402711af8eaa1a4a706b951308e24ea8d1e9 2008-10-10T22:52:37-07:00 2008-10-10T22:52:37-07:00 Added documentation for Rack::Helpers. 5bc69679793874b4cc7ea691c6f3e667a77c41e9 Matt Todd chiology@gmail.com 7b65fa5cab9129799a7cdc15afb15233e76ed16d b9b87a7443611995dd97cfc40104bc6cfbffde53 Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/a1ddda3421f6381a2f7240cbd614377e06c42a8f a1ddda3421f6381a2f7240cbd614377e06c42a8f 2008-10-10T20:26:53-07:00 2008-10-10T20:26:53-07:00 Merge branch 'sprint' of git://github.com/dcolthorp/merb-core 6795fbbcc79ec9e081ea5776caa8e3312e565c80 Andy Delcambre adelcambre@engineyard.com e7cbe925c04d322823e0a6afcc05e586d5c3b0b5 5737a09475cf06a0ac21789bb3091bf3f2372dde Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/b9b87a7443611995dd97cfc40104bc6cfbffde53 b9b87a7443611995dd97cfc40104bc6cfbffde53 2008-10-10T20:24:36-07:00 2008-10-10T20:24:36-07:00 Merge branch 'sprint' of git://github.com/wycats/merb-core into sprint Conflicts: lib/merb-core/bootloader.rb 891d464e553e3425e970aef18ead22806828526b Drew Colthorp colthorp@atomicobject.com 9074828458dbc560cb189dee5fdf1f55547c0d04 5737a09475cf06a0ac21789bb3091bf3f2372dde Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/7b65fa5cab9129799a7cdc15afb15233e76ed16d 7b65fa5cab9129799a7cdc15afb15233e76ed16d 2008-10-10T20:21:27-07:00 2008-10-10T20:21:27-07:00 Merge branch 'sprint' of git://github.com/wycats/merb-core 4caabe6c970cd3b8822d7f778b23ee407004ce27 Andy Delcambre adelcambre@engineyard.com 40cc199d99067a0cf3baf72a85b3ef531414dcd5 Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/9074828458dbc560cb189dee5fdf1f55547c0d04 9074828458dbc560cb189dee5fdf1f55547c0d04 2008-10-10T20:19:39-07:00 2008-10-10T20:19:39-07:00 Rack inline documentation 03084e4c039f4816f84de042c8806f160bf8c593 Andy Delcambre adelcambre@engineyard.com ad0a29856639e81465a691040008832ed023484d Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/e7cbe925c04d322823e0a6afcc05e586d5c3b0b5 e7cbe925c04d322823e0a6afcc05e586d5c3b0b5 2008-10-10T20:17:18-07:00 2008-10-10T20:17:18-07:00 inline docs f8a56016fb66e44b0a010f6e858f325a5a605b76 Drew Colthorp colthorp@atomicobject.com 5737a09475cf06a0ac21789bb3091bf3f2372dde Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/1d8fc893991eac80f469658f0745a3f55df98191 1d8fc893991eac80f469658f0745a3f55df98191 2008-10-10T20:06:35-07:00 2008-10-10T20:06:35-07:00 Fixes the request helper 908ce40690b6130e3b63048e7f1583d50fa31722 Daniel Neighman has.sox@gmail.com 671699bddd373f94bffbfe993bfaee686c558b30 aa173048fbb331980bdfdb802f38574f8ed91803 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5737a09475cf06a0ac21789bb3091bf3f2372dde 5737a09475cf06a0ac21789bb3091bf3f2372dde 2008-10-10T19:32:51-07:00 2008-10-10T19:32:51-07:00 Merge branch 'sprint' of git@github.com:wycats/merb-core into sprint fed13a54e791462a64f4b27d503b25648454e1ee Yehuda Katz wycats@gmail.com cba16e656dbf091771bd10a04729e31a993964c1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/671699bddd373f94bffbfe993bfaee686c558b30 671699bddd373f94bffbfe993bfaee686c558b30 2008-10-10T19:32:36-07:00 2008-10-10T19:32:36-07:00 Fixes a bug with given 7ee1e3c47f85845bc11a25579ae6d57a8e3e8c80 Yehuda Katz wycats@gmail.com 2a14a81032c3df82930cacbc7e4b2dddd60aa31f Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/ad0a29856639e81465a691040008832ed023484d ad0a29856639e81465a691040008832ed023484d 2008-10-10T19:11:47-07:00 2008-10-10T19:11:47-07:00 Make checking for missing locals a little bit faster when rendering partials 8bce7e8e4df1a8952e80211f9c92c1d861afbbae Drew Colthorp colthorp@atomicobject.com a43bd42d1b5739639fb02c7a4d2e0f217ef31a56 Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/40cc199d99067a0cf3baf72a85b3ef531414dcd5 40cc199d99067a0cf3baf72a85b3ef531414dcd5 2008-10-10T17:45:16-07:00 2008-10-10T17:45:16-07:00 updated filter chain documentation in abstract controller 9f339429700ea795cfea3d0ea25c2ea636b07689 Andy Delcambre adelcambre@engineyard.com 26104943b07cf5d4e501e1ea0e2788470549213b Andy Delcambre adelcambre@engineyard.com http://github.com/wycats/merb-core/commit/a43bd42d1b5739639fb02c7a4d2e0f217ef31a56 a43bd42d1b5739639fb02c7a4d2e0f217ef31a56 2008-10-10T17:43:52-07:00 2008-10-10T17:43:52-07:00 updated documentation everywhere for the url() method 8127e8f14dd4c0627586703962b41c28973c1136 Andy Delcambre adelcambre@engineyard.com 3b062ce8f14314b32677065721936937309ef1cc Matt Todd chiology@gmail.com http://github.com/wycats/merb-core/commit/d4003c983169052551eb884f456600fc826bfa55 d4003c983169052551eb884f456600fc826bfa55 2008-10-10T17:25:22-07:00 2008-10-10T17:25:22-07:00 Updated documentation for ControllerMixin. 6c18444dcf94c430d5c032515bdfd049a0cf6501 Matt Todd chiology@gmail.com