b79985a36c29537351d31f81fd79f7202687b681 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/076375701334a7515791397888a94380191d0322 076375701334a7515791397888a94380191d0322 2008-03-04T21:54:35-08:00 2008-03-04T21:54:35-08:00 ignore bundle, and merb-more.rb dbc08b3ebf19a58f4e5d6567b7049e7a4b679b6f Michael D. Ivey ivey@gweezlebur.com e5c210ece78da2e2dddd58f182a24486412073b5 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/b79985a36c29537351d31f81fd79f7202687b681 b79985a36c29537351d31f81fd79f7202687b681 2008-03-04T21:39:24-08:00 2008-03-04T21:39:13-08:00 create merb-more.rb b8e2f3e490967db1e361c68c49728f46585f603b Michael D. Ivey ivey@gweezlebur.com de2439c679e73c1cab5cf1ba4f4fb3633c2d98b4 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/e5c210ece78da2e2dddd58f182a24486412073b5 e5c210ece78da2e2dddd58f182a24486412073b5 2008-03-04T14:13:39-08:00 2008-03-04T14:13:39-08:00 Calling rake spec instead of rake specs (#59) a2c9e69479732222a1a566a8d174bc4c615e92e9 Yehuda Katz wycats@gmail.com 2e91e97e0b2a403996c9f6a1bd016da811782285 Wayne Larsen wayne@larsen.st http://github.com/wycats/merb-more/commit/de2439c679e73c1cab5cf1ba4f4fb3633c2d98b4 de2439c679e73c1cab5cf1ba4f4fb3633c2d98b4 2008-03-04T13:58:29-08:00 2008-03-01T14:08:05-08:00 Frozen merb should mirror changes to bin/merb Signed-off-by: Yehuda Katz <wycats@gmail.com> 65e4158e7e6fd157ce9c0a5fea99ac63e1e7c59c Yehuda Katz wycats@gmail.com 7fde37b4f0457e797a7727f0218e191693e251ae Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/2e91e97e0b2a403996c9f6a1bd016da811782285 2e91e97e0b2a403996c9f6a1bd016da811782285 2008-03-04T13:55:15-08:00 2008-03-04T13:55:15-08:00 Fixes #64 (merb-mailer gobbles too many exceptions); patch submitted by Aaron Wheeler dbf7fc83435323ea7251ecb39e050f5d41e4fcea Yehuda Katz wycats@gmail.com 576d1ad238deddcb285aaa053d8df9592e99f264 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/7fde37b4f0457e797a7727f0218e191693e251ae 7fde37b4f0457e797a7727f0218e191693e251ae 2008-03-04T13:50:39-08:00 2008-03-04T13:50:39-08:00 Replaces outdated rspec stubs (#65) 30b1261de01e3513d000e31b0d36fa5abb800b4d Yehuda Katz wycats@gmail.com b5e79723200fb3d977876156dde05b0fda9cb525 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-more/commit/576d1ad238deddcb285aaa053d8df9592e99f264 576d1ad238deddcb285aaa053d8df9592e99f264 2008-03-04T13:47:04-08:00 2008-02-29T00:08:49-08:00 Mailer documentation Documentation for all methods in merb-mailer and a small fix to PartController. Signed-off-by: Yehuda Katz <wycats@gmail.com> 96990397f6227b3d03b6695f133a65ca7893605f Yehuda Katz wycats@gmail.com 3e2d8f3ba956827130a9dbd91bf1d5211b2b2efc Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/b5e79723200fb3d977876156dde05b0fda9cb525 b5e79723200fb3d977876156dde05b0fda9cb525 2008-03-04T13:28:20-08:00 2008-03-04T13:28:20-08:00 Better formatted 406. f88571a3e9b5c3fce075ed365ed11ab479b09be9 Yehuda Katz wycats@gmail.com c1ecfc0f319520e932502991e5159a3be94cfb30 a8fd459e79f05cbdb1a8aba9ea85689e87f71f08 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/3e2d8f3ba956827130a9dbd91bf1d5211b2b2efc 3e2d8f3ba956827130a9dbd91bf1d5211b2b2efc 2008-03-04T13:24:46-08:00 2008-03-04T13:24:46-08:00 Merge branch 'master' of git@github.com:wycats/merb-more 595fd81da93e796f444df683c61d0e3aa2bbeb39 Yehuda Katz wycats@gmail.com d55d5857094f5e55773090aeef024414f78681ae Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/c1ecfc0f319520e932502991e5159a3be94cfb30 c1ecfc0f319520e932502991e5159a3be94cfb30 2008-03-04T13:24:26-08:00 2008-03-04T13:24:26-08:00 Provide better 406 details. 3043a6a93e625cee45d244c1e609a80f593fc7d1 Yehuda Katz wycats@gmail.com 5bfee2478aeea2fe47cc5d61ce8d4090629e7872 Loren Segal lsegal@soen.ca http://github.com/wycats/merb-more/commit/a8fd459e79f05cbdb1a8aba9ea85689e87f71f08 a8fd459e79f05cbdb1a8aba9ea85689e87f71f08 2008-03-03T20:00:42-08:00 2008-03-03T20:00:42-08:00 Install gem with --local so it won't poll remote servers for updates during install 4fa9b29fcc88b43572c5eec6e0045d48945c7f94 Loren Segal lsegal@soen.ca 38254582ad33622f978e3781dad2aa118050f8dd d55d5857094f5e55773090aeef024414f78681ae Loren Segal lsegal@soen.ca http://github.com/wycats/merb-more/commit/5bfee2478aeea2fe47cc5d61ce8d4090629e7872 5bfee2478aeea2fe47cc5d61ce8d4090629e7872 2008-03-03T19:56:37-08:00 2008-03-03T19:56:37-08:00 Merge branch 'master' of git://github.com/wycats/merb-more 2293db6a7a9e3042243e2a417e3e723f9c133512 Loren Segal lsegal@soen.ca 0c6e0626523c96c4a5872a92e55a1a09c1f3a1e3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/d55d5857094f5e55773090aeef024414f78681ae d55d5857094f5e55773090aeef024414f78681ae 2008-03-03T14:00:27-08:00 2008-03-03T14:00:27-08:00 merb-mailer requires mailfactory. 2293db6a7a9e3042243e2a417e3e723f9c133512 Yehuda Katz wycats@gmail.com 81c3db365c0a2acf5f06f75d53950d134f3621b8 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/0c6e0626523c96c4a5872a92e55a1a09c1f3a1e3 0c6e0626523c96c4a5872a92e55a1a09c1f3a1e3 2008-02-29T20:50:29-08:00 2008-02-29T20:50:29-08:00 remove reference to merb.yml 288810da312b1c65f18b31308a3e80606b575259 Michael D. Ivey ivey@gweezlebur.com ebdfa1ab15fd0304cedb71f980e1b6d179e027e0 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/81c3db365c0a2acf5f06f75d53950d134f3621b8 81c3db365c0a2acf5f06f75d53950d134f3621b8 2008-02-29T20:10:10-08:00 2008-02-29T20:10:10-08:00 Prep for 0.9.1 123ca2f57d42408321549cf8de52ea3287ce5f5d Michael D. Ivey ivey@gweezlebur.com 82207c2be14ab681605bb387ff65336aeaa26935 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/ebdfa1ab15fd0304cedb71f980e1b6d179e027e0 ebdfa1ab15fd0304cedb71f980e1b6d179e027e0 2008-02-29T19:50:22-08:00 2008-02-29T19:50:22-08:00 Removing references to merb-test and fake_request helper 04b78578bfc660f494249ad784f11705f0ddd4f4 Ben Burkert ben@benburkert.com 5da0cfceed88c2f269ea504c5b64338604bb84f9 9923ce9e389c590ffd9d0e96324eae3cf0d02208 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/82207c2be14ab681605bb387ff65336aeaa26935 82207c2be14ab681605bb387ff65336aeaa26935 2008-02-29T13:08:59-08:00 2008-02-29T13:08:59-08:00 Merge branch 'master' of git@github.com:wycats/merb-more 0bb864c9a5e18f5648623b4db286d0e68bc1c3d2 Yehuda Katz wycats@gmail.com 2bb8ef94048f46978668113681f774b1be009c14 9923ce9e389c590ffd9d0e96324eae3cf0d02208 Loren Segal lsegal@soen.ca http://github.com/wycats/merb-more/commit/38254582ad33622f978e3781dad2aa118050f8dd 38254582ad33622f978e3781dad2aa118050f8dd 2008-02-29T01:47:53-08:00 2008-02-29T01:47:53-08:00 Merge branch 'master' of git://github.com/wycats/merb-more 4907d6134f0ad56bbde957658eea53413fa344cb Loren Segal lsegal@soen.ca 64af72ef34b4aa2535fc71382ee55403fb62539b Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/9923ce9e389c590ffd9d0e96324eae3cf0d02208 9923ce9e389c590ffd9d0e96324eae3cf0d02208 2008-02-28T23:20:54-08:00 2008-02-28T23:20:54-08:00 use hash syntax for Merb.config 4907d6134f0ad56bbde957658eea53413fa344cb Michael D. Ivey ivey@gweezlebur.com bd8cb6ac786f75afd13098094d27ea762ce02931 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/64af72ef34b4aa2535fc71382ee55403fb62539b 64af72ef34b4aa2535fc71382ee55403fb62539b 2008-02-28T23:18:32-08:00 2008-02-28T23:05:24-08:00 Updated merb-haml to pull from Merb.config rather than Merb::Plugins.config Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> a1d147c7f350a667c8fbb0af1d3b111ad0da0859 Michael D. Ivey ivey@gweezlebur.com b07840e5e1d01497dc68d493d415c9e98cde20bf Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/bd8cb6ac786f75afd13098094d27ea762ce02931 bd8cb6ac786f75afd13098094d27ea762ce02931 2008-02-28T23:15:41-08:00 2008-02-28T23:10:28-08:00 Added ability to specify Merb.config.builder for merb-builder Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> a0cfab84a68552695fb839cfa66f18fcaf536dce Michael D. Ivey ivey@gweezlebur.com 471e915c2fc6fc1b6aa500bdfb9d847d890abd09 b07840e5e1d01497dc68d493d415c9e98cde20bf Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/5da0cfceed88c2f269ea504c5b64338604bb84f9 5da0cfceed88c2f269ea504c5b64338604bb84f9 2008-02-28T21:36:43-08:00 2008-02-28T21:36:43-08:00 Merge branch 'master' into removing_test 5ce66700e7901656ac70d312ae3b432bd921f43f Ben Burkert ben@benburkert.com 2efd81df18f10a8287c82a1ae0560fa3c46e9a83 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/471e915c2fc6fc1b6aa500bdfb9d847d890abd09 471e915c2fc6fc1b6aa500bdfb9d847d890abd09 2008-02-28T21:22:33-08:00 2008-02-28T21:22:33-08:00 rm -rf merb-test 012cfc47c7701d7a827c78d1ecbb8ce17b60d708 Ben Burkert ben@benburkert.com ab8318535cfbde5ff4ca97d45a89a82477eb82f9 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-more/commit/b07840e5e1d01497dc68d493d415c9e98cde20bf b07840e5e1d01497dc68d493d415c9e98cde20bf 2008-02-28T21:13:24-08:00 2008-02-28T17:49:16-08:00 Parts documentation Added and cleaned up documentation for merb-parts. Signed-off-by: Michael D. Ivey <ivey@gweezlebur.com> c22c808e84d219ce9dea4180f2d5fef05b0922b2 Michael D. Ivey ivey@gweezlebur.com 4d23efa0098ba51eef43d5f67fc8c4d4fbba04cc Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/ab8318535cfbde5ff4ca97d45a89a82477eb82f9 ab8318535cfbde5ff4ca97d45a89a82477eb82f9 2008-02-28T21:04:23-08:00 2008-02-23T01:03:28-08:00 Clean up unused code a1370884fe6868377d823f42c7183d19aa5210c3 Michael D. Ivey ivey@gweezlebur.com c9626a598db8d01621fe951f0ce6faab31c325dd Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/4d23efa0098ba51eef43d5f67fc8c4d4fbba04cc 4d23efa0098ba51eef43d5f67fc8c4d4fbba04cc 2008-02-28T21:00:04-08:00 2008-02-28T04:39:06-08:00 Added support for partial templates. 7ddc1964457adf2d600624c4ef7f2620c3d0b6e3 Michael D. Ivey ivey@gweezlebur.com ce20e5ef4c467ceaeb62a1554190274755320922 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/c9626a598db8d01621fe951f0ce6faab31c325dd c9626a598db8d01621fe951f0ce6faab31c325dd 2008-02-28T20:59:57-08:00 2008-02-23T00:43:47-08:00 Added merb-builder to gem list 76ee5faec8405091c775e752fd0d04e2ba4f0c0a Michael D. Ivey ivey@gweezlebur.com 2efd81df18f10a8287c82a1ae0560fa3c46e9a83 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/ce20e5ef4c467ceaeb62a1554190274755320922 ce20e5ef4c467ceaeb62a1554190274755320922 2008-02-28T20:59:50-08:00 2008-02-23T00:35:44-08:00 Added merb-builder template engine 6ea45b2363205aac2dc83e51676563fdb35fa424 Michael D. Ivey ivey@gweezlebur.com 1dc8750aee0f8f9bc47a482461c072791f051e69 Jack Dempsey jack.dempsey@gmail.com http://github.com/wycats/merb-more/commit/2efd81df18f10a8287c82a1ae0560fa3c46e9a83 2efd81df18f10a8287c82a1ae0560fa3c46e9a83 2008-02-28T16:52:14-08:00 2008-02-28T15:07:02-08:00 rename class to correctly be MerbResourceControllerTestGenerator The class name found in this file was MerbControllerTestGenerator instead of MerbResourceControllerTestGenerator as it should be. Signed-off-by: Yehuda Katz <wycats@gmail.com> c1d29cc8e7f3a90897a8d118a25ceb31f50e7afb Yehuda Katz wycats@gmail.com b45d4a110f1a2eaa8f54bece0483e0254042f7b1 Dr Nic drnicwilliams@gmail.com http://github.com/wycats/merb-more/commit/1dc8750aee0f8f9bc47a482461c072791f051e69 1dc8750aee0f8f9bc47a482461c072791f051e69 2008-02-28T14:54:20-08:00 2008-02-28T14:54:20-08:00 merb-gen upgraded rubigen dependency to 1.2.4 for bug fix bb59d44f81dd33fb7e12e8e4e7d03c250c822832 Dr Nic drnicwilliams@gmail.com