b9fee4b1f253ff64d5afeddc020476a620452489 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/91c1bdf8617ae9a73bb3d426b64eae81e7b103d1 91c1bdf8617ae9a73bb3d426b64eae81e7b103d1 2008-10-29T13:31:08-07:00 2008-10-29T13:31:08-07:00 More deletions 8910d6b873c4bab10e1efad4429a3947debc8910 Yehuda Katz wycats@gmail.com 9191176c4c189bb793688dcce1f6075182c6ecc0 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/b9fee4b1f253ff64d5afeddc020476a620452489 b9fee4b1f253ff64d5afeddc020476a620452489 2008-10-29T13:30:01-07:00 2008-10-29T13:28:46-07:00 Notice of new location 2328d2013e3722f89598e12e57ed6c95a26e439e Yehuda Katz wycats@gmail.com 5078b8bf11f23b1f4e42c701438c37c6140fd93e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9191176c4c189bb793688dcce1f6075182c6ecc0 9191176c4c189bb793688dcce1f6075182c6ecc0 2008-10-29T13:30:01-07:00 2008-10-29T13:27:37-07:00 Removes merb-core de52a19262c08e7dbd41ebb6d0c08a489f0c5732 Yehuda Katz wycats@gmail.com c122ec92e2defdddb6ed1fc6b317990696f74b45 David James djwonk@collectiveinsight.net http://github.com/wycats/merb-core/commit/5078b8bf11f23b1f4e42c701438c37c6140fd93e 5078b8bf11f23b1f4e42c701438c37c6140fd93e 2008-10-12T19:31:06-07:00 2008-10-12T18:14:07-07:00 Fixed warning about STATUS_CODES due to 2 requires. Signed-off-by: Michael S. Klishin <michael@novemberain.com> 745c53f7251cd27048a069865f4052ec652f6dd9 Michael S. Klishin michael@novemberain.com 72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/c122ec92e2defdddb6ed1fc6b317990696f74b45 c122ec92e2defdddb6ed1fc6b317990696f74b45 2008-10-12T18:10:06-07:00 2008-10-12T18:09:12-07:00 Use pointers to frozen strings instead of creating new objects on every request (does not make sense everywhere though). 785e0333d66f4201240933cb9d14f06efd68e9a9 Michael S. Klishin michael@novemberain.com 209ca502a6e44f3115042f90b90caec6f82580ed Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf 72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf 2008-10-12T16:22:08-07:00 2008-10-12T16:15:22-07:00 Added Merb::Router.extensions as an official API. Merb::Router.extensions is now the official way to add functionality to the router. b5434d3139a1401454adc3a68868e3a15d5159e6 Carl Lerche carllerche@mac.com 11d19c269a029403039b16866aaa8d6bb1a366ff Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/209ca502a6e44f3115042f90b90caec6f82580ed 209ca502a6e44f3115042f90b90caec6f82580ed 2008-10-12T11:24:36-07:00 2008-10-12T11:24:36-07:00 Fixes a minor problem with has_tag/with_tag. 717f7f78d09e5e8d888bf210e5f10ab2d5988bc9 Michael S. Klishin michael@novemberain.com ee43bd5f870bb9ad822bdade58cd970fc088b975 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/11d19c269a029403039b16866aaa8d6bb1a366ff 11d19c269a029403039b16866aaa8d6bb1a366ff 2008-10-12T09:23:39-07:00 2008-10-12T09:23:39-07:00 Use frozen constants on the 'hot path' if possible. 1cd2a6b3302990b1ec00d57e4becbf4db36b8422 Michael S. Klishin michael@novemberain.com 36c7538548f8b511c23a8e75600217edc9fd039b 57d84f2020926f26bebc2090ba51bf01dadc32e2 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ee43bd5f870bb9ad822bdade58cd970fc088b975 ee43bd5f870bb9ad822bdade58cd970fc088b975 2008-10-12T08:36:59-07:00 2008-10-12T08:36:59-07:00 Resolved conflict, added a note on metaprogramming use in -core. Sometimes it is appropriate. cbd70c68a723d468d72f89ee5efe692d12136dae Michael S. Klishin michael@novemberain.com afa48c563f5faf06227e1b6b1b73f7638cfe960c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/36c7538548f8b511c23a8e75600217edc9fd039b 36c7538548f8b511c23a8e75600217edc9fd039b 2008-10-12T07:48:15-07:00 2008-10-12T07:48:15-07:00 Correct documentation of session_expiry option. c6c70bbde5f45e0fea55e229aabaf58abe37595b Michael S. Klishin michael@novemberain.com 173c4a1889afe4fa355cd768b0c8c66ebbe987f6 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/afa48c563f5faf06227e1b6b1b73f7638cfe960c afa48c563f5faf06227e1b6b1b73f7638cfe960c 2008-10-12T07:45:54-07:00 2008-10-12T07:45:11-07:00 Use frozen constants on the hot path where possible. 28f0f4cac058b9c3f610d0b9042c2d3ae786ecc0 Michael S. Klishin michael@novemberain.com d4739e7620f2f553578009c859de2dae4863c8a4 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/173c4a1889afe4fa355cd768b0c8c66ebbe987f6 173c4a1889afe4fa355cd768b0c8c66ebbe987f6 2008-10-11T21:34:00-07:00 2008-10-11T21:34:00-07:00 Fixes 2 syntax errors in specs. Forking runner swallowed those. 9250f2cd81f38594bf2cf24827c66a62c15e3b84 Michael S. Klishin michael@novemberain.com ef6092a6ee79d112eccbea1b8862c21d46d51b99 Michael Holub michael.holub@gmail.com http://github.com/wycats/merb-core/commit/d4739e7620f2f553578009c859de2dae4863c8a4 d4739e7620f2f553578009c859de2dae4863c8a4 2008-10-11T21:31:08-07:00 2008-10-11T07:21:59-07:00 fixed specs for viewmatchers Signed-off-by: Michael S. Klishin <michael@novemberain.com> 607f8165a7abae6bf04d4a1884a023e5b858f0de Michael S. Klishin michael@novemberain.com 1f6de2c3a0ec4bf42b4d6883e3898c2cc395f118 Michael Holub michael.holub@gmail.com http://github.com/wycats/merb-core/commit/ef6092a6ee79d112eccbea1b8862c21d46d51b99 ef6092a6ee79d112eccbea1b8862c21d46d51b99 2008-10-11T21:30:57-07:00 2008-10-11T06:42:11-07:00 Add warning when loading rexml instead of libxml-ruby Signed-off-by: Michael S. Klishin <michael@novemberain.com> 53c61f0e45282bf7fb00ad6f78b61d16b10f1a4c Michael S. Klishin michael@novemberain.com 42da35e9861d0ca0ef228a017316a31d76cf0e29 Michael Holub michael.holub@gmail.com http://github.com/wycats/merb-core/commit/1f6de2c3a0ec4bf42b4d6883e3898c2cc395f118 1f6de2c3a0ec4bf42b4d6883e3898c2cc395f118 2008-10-11T21:30:50-07:00 2008-10-10T18:56:39-07:00 #329 bug fix Signed-off-by: Michael S. Klishin <michael@novemberain.com> 0935c21c912e5641c3abf0ec168bf014d75a7ea2 Michael S. Klishin michael@novemberain.com 3ae019fe96ffaa6cdaa79181279a1f8ef192eb69 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/42da35e9861d0ca0ef228a017316a31d76cf0e29 42da35e9861d0ca0ef228a017316a31d76cf0e29 2008-10-11T21:30:03-07:00 2008-10-11T21:30:03-07:00 Log syntax errors when loading the app. cba5dac7c5570b3c1164d3544e4b1a62dbd7a3ba Michael S. Klishin michael@novemberain.com 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