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 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 62875e042425f7eac39c1d9220ba9085ddb2a293 Drew Colthorp colthorp@atomicobject.com http://github.com/wycats/merb-core/commit/7a73c146dd28f4456b7ef2d1819834c67e04fa2a 7a73c146dd28f4456b7ef2d1819834c67e04fa2a 2008-10-10T10:54:14-07:00 2008-10-10T00:24:34-07:00 Move most merb logger code out, into extlib 790b40f3e796738c58a26e99b2c142b65f846a60 Drew Colthorp colthorp@atomicobject.com 3d4aa1efad1d25de4d8cf93f2fde64b83bb9c30b Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/285a8e1a23f303da2f186218c236d149584490cc 285a8e1a23f303da2f186218c236d149584490cc 2008-10-10T10:54:13-07:00 2008-10-08T17:43:50-07:00 Fixes logger delimiter, adds new Merb.fatal! catches, and changes Merb.logger = nil to Merb.reset_logger! b3695208a777ae145f10f417a9bd56abbf633d41 Drew Colthorp colthorp@atomicobject.com 962514cdec3ae0a4c5b697fe4d15fd7c75168e4a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/06a92fdd64917f24a27d6f3caa6eb6a1ef290325 06a92fdd64917f24a27d6f3caa6eb6a1ef290325 2008-10-07T10:48:20-07:00 2008-10-06T12:53:08-07:00 Fixes pooling issue in Extlib by making a hook for exiting, and adds support for dependency taking a block f1e6295cd6b4215eb756fdb5e4241b50f58e155d Yehuda Katz wycats@gmail.com 5a10f1840c3af5e1ddfc5895b85512d649541ffa Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/962514cdec3ae0a4c5b697fe4d15fd7c75168e4a 962514cdec3ae0a4c5b697fe4d15fd7c75168e4a 2008-10-07T05:06:24-07:00 2008-10-07T05:02:32-07:00 Removed dead code. 81449d7d8af24df8fd35bc3c5bb36021ddf3e556 Michael S. Klishin michael@novemberain.com 4c4f24ad393999037e34e5f0791674217c6862dd Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/5a10f1840c3af5e1ddfc5895b85512d649541ffa 5a10f1840c3af5e1ddfc5895b85512d649541ffa 2008-10-07T05:06:24-07:00 2008-10-07T04:26:07-07:00 Use new logger options log_stream/log_file the same way everywhere. dbdbd644d6a3826d599cbb0554f4c0f54bcfeb55 Michael S. Klishin michael@novemberain.com d3b68cd90fbf79805322ffba994acadfdfe51f6c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/cd4f229a67ce696e7eb77914f9b4d45a3d1f1fdd cd4f229a67ce696e7eb77914f9b4d45a3d1f1fdd 2008-10-05T10:22:00-07:00 2008-10-05T10:21:14-07:00 Move inflection code and Dictionary to extlib. 008e03319417cea375d4ce1a7f14c84b2a308af0 Michael S. Klishin michael@novemberain.com 127bef9ebbeffda8af02841cb54bc7f3c29a3777 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/d3b68cd90fbf79805322ffba994acadfdfe51f6c d3b68cd90fbf79805322ffba994acadfdfe51f6c 2008-10-05T10:22:00-07:00 2008-10-05T07:09:07-07:00 Rakefiles should be empty by default (so RSpec is not pushed down test unit users' throat). 190fe89321a3426df3a551c2609e27addaaf9bfb Michael S. Klishin michael@novemberain.com 2d31e4b35f7698fc9667ccca5d5b3e9528486a90 Dudley Flanders dudley@misnomer.us http://github.com/wycats/merb-core/commit/fed193936802af5d3563acf1ba5c8f9f33a72351 fed193936802af5d3563acf1ba5c8f9f33a72351 2008-10-04T21:45:33-07:00 2008-10-04T20:23:32-07:00 Allow Merb.disable(:signals) to keep Merb from installing any signal handlers. Signed-off-by: Yehuda Katz <wycats@gmail.com> 4deb3e9dfb7025e984e99624c12c6b2585c6ab52 Yehuda Katz wycats@gmail.com d867f2470d4ed05c3c8f6760eba3304e3aa9fa4a Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/23406c5c7d058f609e3d4c4fc736aac6b904b962 23406c5c7d058f609e3d4c4fc736aac6b904b962 2008-10-02T14:58:11-07:00 2008-10-02T14:58:11-07:00 Removed spec/private/config b5985f3d0d074389c30e6dd6270226d559131adb Fabien Franzen info@atelierfabien.be 17152c0f717f2451f15cdb8c2d2bc8bffa1858a5 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/5110677bfd417cc7931d0de8a4bb286c92531eea 5110677bfd417cc7931d0de8a4bb286c92531eea 2008-10-02T12:12:42-07:00 2008-10-02T12:12:42-07:00 If --log-level or --log is explicitly given, never log to STDOUT, alsways to file 93f499d085081a7cdbd9c700294b50ad945808ba Fabien Franzen info@atelierfabien.be 0ac860413522aa030cb347bfe4ba5021035adf6d Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/8a1999aa24fcf7be4e615894f2fad218af530c14 8a1999aa24fcf7be4e615894f2fad218af530c14 2008-10-02T06:07:33-07:00 2008-10-02T06:07:33-07:00 If Merb.env?(:test) we don't need ugly = true spread all over the place 3004e8e668afff8f515150da6095713bad247127 Fabien Franzen info@atelierfabien.be 0f4957f2e03ba79eb914563507b0582738fb5d37 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/a6f6a986ab3aa1414368d24892a808c448ecb564 a6f6a986ab3aa1414368d24892a808c448ecb564 2008-09-27T23:06:08-07:00 2008-09-27T23:06:08-07:00 Merge in forking branch. * Merb starts with master and worker processes now. * Logger is now 100% thread safe and works on current JRuby. * New options for fast redeploy/restart of cluster. * Reloading machinery should be bullet proof now. Squashed commit of the following: commit 4405ac5db172a40d533b71a0a57a3233aea13435 Author: Yehuda Katz <wycats@gmail.com> Date: Sun Sep 28 01:24:39 2008 -0400 Add --fast-deploy option commit 247779ebe96100b49690581801a897636e72b36a Author: Yehuda Katz <wycats@gmail.com> Date: Sun Sep 28 01:19:39 2008 -0400 Operator precedence ftl commit 55dcdc6fbc29257dcaf25997d59cdf66fb66a507 Author: Yehuda Katz <wycats@gmail.com> Date: Sun Sep 28 00:31:53 2008 -0400 Somehow the code that supports a single log file went missing :P commit afc291cd9d5c660c4071741b21e79a3df62223f2 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 27 16:23:28 2008 -0400 Tests pass: we don't need to fork for class load in test env, plus update config spec for some small changes to the internal API commit 67e1756c267edb27f0229e0e7f9883736868742a Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 27 16:14:16 2008 -0400 get merb -k and merb -K to work (with and without `all') commit eb52fcec508a458af4d2d286223960b24a2954c3 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 27 16:13:48 2008 -0400 Fix bug with creating a new log commit 70a47b4b70c67a0328f1845fab0f9ef258a1ec87 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:58:28 2008 -0700 Reload spec needs to be added back later; logger specs work again after removing mocks and modifying specs for public API changes commit fdc4ec0c04073e4ffca7d484152dbaedf02f1f97 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:38:57 2008 -0700 Fix logger helper commit d22b8e6c60b48718e7484a1154a2211c5fa17404 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 22:12:14 2008 -0700 Attempt threadsafe logger commit 205f2436a741841abc92901c015f3c470a5b99b7 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:57:07 2008 -0700 Hide the backtrace for Mongrel timeout errors. commit 27779e1f857c3555c87451a1011bbeee646fa1f5 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:22:17 2008 -0700 Respawn processes killed with kill -9 commit f4fd0d39ea76e1722ee115f15f307732603d7ce4 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:18:02 2008 -0700 Tons of comments; support for various forking configurations commit acb90a6e57e075717a235f5896df545937880416 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 22:32:13 2008 -0700 Forking setup works without any forking. commit ab4f142a2433452c940696d2f6bd9e23e375ea20 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:59:58 2008 -0700 Update thin for new stop() API commit e5937d5a6a08d29fcf0d40b3eb6e18a6dc7191a7 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:58:35 2008 -0700 Added better errors for failures originating with Merb commit 04e2a9b4e7e997613d0f712d4d79612304066808 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:57:20 2008 -0700 Checked in experiments (for posterity) commit 7e8385254168c99e39208fbadbdb4758c9f52b92 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 13:16:56 2008 -0700 All Ruby-based servers work now with forking; NEXT: Make forking only happen when appropriate commit abe9f500695154adc0da4535652ef8a070435875 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 01:35:33 2008 -0700 Help REE make better use of GC commit 388941a35c0454153f0e80ae9ec9deb44c5d2252 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 23:47:13 2008 -0700 Ebb works commit a5b48f4ba2ac499a020d748466f8cba2a8223fb6 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 22:26:07 2008 -0700 Someone should figure out why I had to make the change I needed to in config.rb; abstract up the API for making a new forkable process; thin-turbo appears to have some issues commit 6e2a107c4bec7281ff944b92dd426f1c47137663 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 12:10:55 2008 -0700 Fix some more issues relating to graceful exits; remove pids on exit; TODO: merb -k must work commit 717d5a8667a1fc206061c007e00528643676fb5e Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 00:05:26 2008 -0700 Tighten things up so that ctrl-c works correctly commit 76eba224d0beed7a32a2e20826f0f0574a4e20c9 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 21:18:20 2008 -0700 Reload works again commit ca5d6b2a3df884a074d289a41eeb56f540849686 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 18:32:55 2008 -0700 Finish up making mongrel handle everything correctly. We need to update merb -k to use the new signals. commit 9ec4de2155eab3f398138889584f3dfd25d226c2 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 10:16:04 2008 -0700 More forking support commit ec7cfae89c157333a3df6c57a9b1987caf51f7e4 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 20 00:52:47 2008 -0500 Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4 commit aceea3838234535573aa02c2d914d65c11a1ceb5 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 18:47:09 2008 -0500 Split out the code transaction into a method and do some experimentation with cluster forking. commit 56e09f16c302126864c72adf9ecbdf992b29c8a3 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:43:39 2008 -0700 Better exit message commit 2b67c34ac05de5c48260baa9a6f0d95f70101ab4 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:10:19 2008 -0700 Initial support for fast redeploys and code reloading via forks. commit b7e9fc3e9f08c7970d1b6d69928e832511c7f2fe Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:58:28 2008 -0700 Reload spec needs to be added back later; logger specs work again after removing mocks and modifying specs for public API changes commit bdf5c2d82d7420f4604e48f60e69e2d2f037858a Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 23:38:57 2008 -0700 Fix logger helper commit 8b09d459156158673d174a2d86cc32bf5175049c Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 26 22:12:14 2008 -0700 Attempt threadsafe logger commit b3b0eb25e3037031a34588683be8e6d6c8db621c Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:57:07 2008 -0700 Hide the backtrace for Mongrel timeout errors. commit 315d89c21f13b32c6db4d58ce945be361061ca6f Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:22:17 2008 -0700 Respawn processes killed with kill -9 commit a7ba4dbb14aa0a3e6a56757713f18820b241c982 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 23:18:02 2008 -0700 Tons of comments; support for various forking configurations commit 093d38fcb65f67ac44e786e266475c88f7c16d38 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 22:32:13 2008 -0700 Forking setup works without any forking. commit 9e4d8c861806c782b99b00bcbc98ee1223113fc7 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:59:58 2008 -0700 Update thin for new stop() API commit 7c376ee3dd3e797026b5e0917a58c897d8a623f5 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:58:35 2008 -0700 Added better errors for failures originating with Merb commit 0ea49649648e307f7289edee928a8485ba96f75f Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 17:57:20 2008 -0700 Checked in experiments (for posterity) commit da7611a85255b5fb80e728bb7af48dfba8ff44d0 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 13:16:56 2008 -0700 All Ruby-based servers work now with forking; NEXT: Make forking only happen when appropriate commit 5cd1901d7edd8cc98a2b83da45b4a85ff741f0e8 Author: Yehuda Katz <wycats@gmail.com> Date: Thu Sep 25 01:35:33 2008 -0700 Help REE make better use of GC commit 291c3127375786fd64d0808327670d702157f30c Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 23:47:13 2008 -0700 Ebb works commit 956782efc0ab3877eb0161c0b9140fb118db4d4d Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 22:26:07 2008 -0700 Someone should figure out why I had to make the change I needed to in config.rb; abstract up the API for making a new forkable process; thin-turbo appears to have some issues commit 099dc18ff81094a707790e99a922504e661aeba0 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 12:10:55 2008 -0700 Fix some more issues relating to graceful exits; remove pids on exit; TODO: merb -k must work commit d209193a88ab5d522213e4f1747942e1b04b21f3 Author: Yehuda Katz <wycats@gmail.com> Date: Wed Sep 24 00:05:26 2008 -0700 Tighten things up so that ctrl-c works correctly commit bd10fe6dfcd197b602474f9afd6075db337fb005 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 21:18:20 2008 -0700 Reload works again commit 6c2ebcc54a48ac0ef678ac544ebe22858ed5029c Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 18:32:55 2008 -0700 Finish up making mongrel handle everything correctly. We need to update merb -k to use the new signals. commit 412c4c163dfa363a7c64e047ec4e54c1b61832a4 Author: Yehuda Katz <wycats@gmail.com> Date: Tue Sep 23 10:16:04 2008 -0700 More forking support commit 94c5eb8d213b107b1c82314cb972649226629376 Author: Yehuda Katz <wycats@gmail.com> Date: Sat Sep 20 00:52:47 2008 -0500 Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4 commit 9a57de6ab3253280b90e3e4bf9dc49b1b2a51c61 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 18:47:09 2008 -0500 Split out the code transaction into a method and do some experimentation with cluster forking. commit 71306ed36084efcafcb51f07bb426509f9fafe4a Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:43:39 2008 -0700 Better exit message commit b7dac300dc08fc8d89e1e2344c4ec77a5e0ad5b6 Author: Yehuda Katz <wycats@gmail.com> Date: Fri Sep 19 13:10:19 2008 -0700 Initial support for fast redeploys and code reloading via forks. bd147d0913731b6aaffcc209d49c8d1c3d6fd355 Michael S. Klishin michael@novemberain.com daf3f2d941d163d1fe4de27c68ac1a00ff78b74e Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/6d01911af6a2b867f2b360c1f92fef0ade4f4fa0 6d01911af6a2b867f2b360c1f92fef0ade4f4fa0 2008-09-26T07:32:35-07:00 2008-09-26T07:32:35-07:00 Added Merb::RakeHelper.install_package method to install packages directly f73956cd1fdea81721c2d68524042ec8da3d9091 Fabien Franzen info@atelierfabien.be eca567b1930cb0e333f79881672e1e47bc9cc5ae Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/135005680c276a4b7723a58d62b25e26fa069a33 135005680c276a4b7723a58d62b25e26fa069a33 2008-09-23T14:46:36-07:00 2008-09-23T14:46:36-07:00 Added require 'thread' explicitly for Mutex to be available 7db017d1daa7b6ba1f19d93568bff9c748cd4213 Fabien Franzen info@atelierfabien.be caa69b877ceb128ce3057d9623a97385b5360ac6 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/eca567b1930cb0e333f79881672e1e47bc9cc5ae eca567b1930cb0e333f79881672e1e47bc9cc5ae 2008-09-23T10:25:45-07:00 2008-09-23T10:25:45-07:00 Revert "Initial support for fast redeploys and code reloading via forks." This reverts commit 6c6c660be07647319e46635c7dbc5ea9545ce89e. c82006abcf5e6e14081c29179c977958fb8258de Yehuda Katz wycats@gmail.com ec6ee0faa85f633eba0764ad25394540681149e1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/964d79341823bb5e961639ab844191ae03fffc63 964d79341823bb5e961639ab844191ae03fffc63 2008-09-23T10:24:51-07:00 2008-09-23T10:24:51-07:00 Revert "Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4" This reverts commit a8c8339f2423921383acce530f567e82f87fad9d. 4b0edb5243b9034b4346581042d55e25a6494630 Yehuda Katz wycats@gmail.com 5f3b685bc0c248d06522ad430935d816f6e6a4cb Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a8c8339f2423921383acce530f567e82f87fad9d a8c8339f2423921383acce530f567e82f87fad9d 2008-09-23T10:16:38-07:00 2008-09-19T22:52:47-07:00 Initial experiments are a success. TODO: Move the logic out of mongrel and make a proper clustering instead of hardcoding to 4 bef306288d20132dc70b5cc0c8c119b85d6d24bf Yehuda Katz wycats@gmail.com d3b96fdd632627f272cc356399edb33ac16d7481 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/6c6c660be07647319e46635c7dbc5ea9545ce89e 6c6c660be07647319e46635c7dbc5ea9545ce89e 2008-09-23T10:16:37-07:00 2008-09-19T13:10:19-07:00 Initial support for fast redeploys and code reloading via forks. ed2a7f54050e9052946fe250108541657f7bf88d Yehuda Katz wycats@gmail.com cb6813e09f818198e8bc975a8b4e37c4c211cd1a Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/ff124ef90f0fb9e3cea12230762c5e9fb6411de7 ff124ef90f0fb9e3cea12230762c5e9fb6411de7 2008-09-17T02:47:30-07:00 2008-09-17T02:47:30-07:00 More fine-grained check to see if a local ./bin executable should have been used 70ff0063e34e4b28fbb27dacb6a082ea6cefc16c Fabien Franzen info@atelierfabien.be 38c11dc67d5a995af3e19842506a27a0218ab8cc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7c0461415dabfd310b7a4f2ae19cdcac9e93d352 7c0461415dabfd310b7a4f2ae19cdcac9e93d352 2008-09-16T03:42:45-07:00 2008-09-16T03:42:45-07:00 Make flat! more useful 375ef8c16adf941b1c5b8976c91c3e8d0eaf2a92 Yehuda Katz wycats@gmail.com e5ad28a901a2110f4420f9512a851a316d234816 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/0eba652e6b829aa2c5c15e2b627ab59eaf730345 0eba652e6b829aa2c5c15e2b627ab59eaf730345 2008-09-13T08:17:20-07:00 2008-09-13T08:17:20-07:00 Better local gems dir detection and end-user feedback 469cc32aeb729be4dc104bfec8addd6a92c2191d Fabien Franzen info@atelierfabien.be 644ab28ee7b6db6a333c90b70a25fb40d8dacb79 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/cfab55e543fa70b1bc76362f8019fc0571ac29ab cfab55e543fa70b1bc76362f8019fc0571ac29ab 2008-09-13T06:22:26-07:00 2008-09-13T06:22:26-07:00 Fixed compatibility with the *new* bundle logic 99e13afe1b6a8895a925f9a7cf4abf7110f59624 Fabien Franzen info@atelierfabien.be 06e97c30bb03d802c0ca7b7e5d41127bc4982449 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/78b96e43f8f85d3e3381a72afde92fbc9d284bf3 78b96e43f8f85d3e3381a72afde92fbc9d284bf3 2008-09-12T15:30:42-07:00 2008-09-12T15:30:42-07:00 Removed MerbScriptHelper - simplified loading bundled gems - see merb.thor e783a1f7494df15055498c29cf5d430b2c143157 Fabien Franzen info@atelierfabien.be b38a93c8abf4a65211596e9543bf1354a06bc4e0 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/e5c1f9dccd589a0db157cc484892d217f9464417 e5c1f9dccd589a0db157cc484892d217f9464417 2008-09-08T05:27:29-07:00 2008-09-08T05:27:29-07:00 Merge in simple conditional get support at controller level. Use #etag=, #last-modified= and #request_fresh? to possibly cut off DB queries and return a 304 response if request is fresh. Merges: PUBLIC_CHANGELOG lib/merb-core.rb lib/merb-core/controller/merb_controller.rb lib/merb-core/dispatch/session.rb lib/merb-core/dispatch/session/cookie.rb lib/merb-core/dispatch/session/memcached.rb lib/merb-core/dispatch/session/store_container.rb 57afcecfac7ff760fc8c4a7c2fa0da7a01613284 Michael S. Klishin michael@novemberain.com 2369da6c785948026e4c90a1e53ad2f485ee8c21 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/b38a93c8abf4a65211596e9543bf1354a06bc4e0 b38a93c8abf4a65211596e9543bf1354a06bc4e0 2008-09-07T10:00:41-07:00 2008-09-07T10:00:41-07:00 Merged in new bundling (aka freezer) branch 452b368f04956c0cabf318f8ab77612f5534b8c2 Fabien Franzen info@atelierfabien.be 3b6a8d5fdf5040cbb17890260e3a8fe67acf8b21 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-core/commit/2369da6c785948026e4c90a1e53ad2f485ee8c21 2369da6c785948026e4c90a1e53ad2f485ee8c21 2008-09-07T09:41:29-07:00 2008-09-07T09:41:29-07:00 Merged in new-sessions branch 152b17c6ff74bb11542e5068873e4e8e28224944 Fabien Franzen info@atelierfabien.be 8d20aa54d5e3630fbaabadc8653d10fad0df0645 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/0dd22c4003dcf2c502e0f48bd91b56995e3e5679 0dd22c4003dcf2c502e0f48bd91b56995e3e5679 2008-08-21T21:35:30-07:00 2008-08-21T21:35:11-07:00 Fix passenger issue 5b3a0145a052740f0cfc05c711d55a958b9509e3 Yehuda Katz wycats@gmail.com dac9cce28f6ea8fdb9955e2227b701893bfce19d Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/bb9b62aca41e68ec3c74a3c6fbecc9823d02afb1 bb9b62aca41e68ec3c74a3c6fbecc9823d02afb1 2008-08-15T04:58:34-07:00 2008-08-15T04:58:34-07:00 No longer use Pathname for Merb.root and friends. Admit that Pathname for Merb.root, Merb.dir_for and friends was not very good idea. Merb.root returning instance of Pathname caused some hard to track down problems with logger when Merb is daemonized on Linux. Other than that, Merb.root / '/log' would result into Pathname pointing to /log (yes, FS root). It sure caused a lot of confusion. e2ac56531ca06823f61850b429898c20f3db343f Michael S. Klishin michael@novemberain.com 4f7070cf15632c97864f703844e26ca4b51cf666 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-core/commit/c863030bd2903d685c3b191eea564f5753eb5547 c863030bd2903d685c3b191eea564f5753eb5547 2008-08-14T11:05:23-07:00 2008-08-14T11:05:23-07:00 readded _generator_scope methods with deprecation warnings 01f7b76c3f533090cb4e502a91449dc3c04c675a Jonas Nicklas jonas.nicklas@gmail.com 552305fdb73949ed954afd4b1428ae88fd20483b Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-core/commit/314a2efd3f502bfa0cdc594dee03a3ce23eeaf83 314a2efd3f502bfa0cdc594dee03a3ce23eeaf83 2008-08-14T09:35:08-07:00 2008-08-09T13:51:24-07:00 added use_template_engine method and removed generator_scope code that is no longer needed 93972a22f14f8d5eb4ea1891fd310d6dfe86f62e Jonas Nicklas jonas.nicklas@gmail.com e74fef5c8b24ac6d36577f7fdde7c4db6c39a749 558ba135fab702c51ba5cac531c3c5aa3d57c1a3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/0166ccd015f2ada8ad85b7c327995cf017e1a322 0166ccd015f2ada8ad85b7c327995cf017e1a322 2008-08-04T13:11:30-07:00 2008-08-04T13:11:30-07:00 Merge branch 'master' of git@github.com:wycats/merb-core a9baaf9a6dd9ec4c2abd874e87a22682f118ebd5 Yehuda Katz wycats@gmail.com e8d5b806fa02a157e3eef56f4902c8aaef62311f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/95c509e41b3b75a3e380ab7e1450063121566211 95c509e41b3b75a3e380ab7e1450063121566211 2008-08-03T16:38:48-07:00 2008-08-03T16:38:48-07:00 Fix some ruby warnings 2957a45b0a8bc3cbc069a358a0c32ae5ac778d6d Yehuda Katz wycats@gmail.com bfbb9e0744465d1ee9cfbd8aab7e7c68a5c098d2 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/901ec3fa2617ffe39f70347ac749a1a64f261903 901ec3fa2617ffe39f70347ac749a1a64f261903 2008-07-23T17:12:21-07:00 2008-07-23T17:12:21-07:00 Yeah... not a good idea 2bcb8203752cc4f1f5b8ccdd7eb406104e25e837 Yehuda Katz wycats@gmail.com