c019974cb103ca21722fe18c12872c50669a2ea3 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/509851b02f2bcb7936f3a122b499e69253280ce5 509851b02f2bcb7936f3a122b499e69253280ce5 2008-07-19T19:44:00-07:00 2008-07-19T19:44:00-07:00 Add support for argument capture and fix $DEBUG bootloader stuff [#390 state:resolved] b39ac3003c130aacf1eab8fa38d585fdc3f01e84 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 176857bb339f6b5dbbcbbe03dcbb7ba10184d64d Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/c019974cb103ca21722fe18c12872c50669a2ea3 c019974cb103ca21722fe18c12872c50669a2ea3 2008-07-17T03:17:26-07:00 2008-07-17T03:17:26-07:00 Add support for OPTIONS 3520111a7e507b4468ec656daf7e0e461ea0fa6c Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 0c3fe049afb0e344751c0d751a09702d8fc3f519 632a179074e825762f84d9f5b707494d58b9e25c Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/176857bb339f6b5dbbcbbe03dcbb7ba10184d64d 176857bb339f6b5dbbcbbe03dcbb7ba10184d64d 2008-07-17T01:58:08-07:00 2008-07-17T01:58:08-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 867c5253f295e10de920389ad4eb316bc67a1d5e Yehuda Katz wycats@yehuda-katzs-macbook-pro.local dc701bcfced392ce1d6b1cda7a51a2a9dd1b6d9d Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/0c3fe049afb0e344751c0d751a09702d8fc3f519 0c3fe049afb0e344751c0d751a09702d8fc3f519 2008-07-17T01:50:11-07:00 2008-07-17T01:50:11-07:00 display doesn't throw an error if a layout is not found, even if one is specified (because of class-wide layout options) 8683c51c7b193a1032ce0a86c9304aa2e3e0a7fb Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 40977a6b130b29a9d43b7c72d7c1aeebd9c10f70 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/632a179074e825762f84d9f5b707494d58b9e25c 632a179074e825762f84d9f5b707494d58b9e25c 2008-07-16T16:38:13-07:00 2008-07-16T16:38:13-07:00 throw_content now concatenates, not replaces, content 0a940fce68ebcf4cdb7f29cbd3ce073cb3e0119a Michael S. Klishin michael@novemberain.com 0b0f4f1431d0b6d950c5eeaeb5d311e706281f08 Will Prater will@mercurycloud.com http://github.com/wycats/merb-core/commit/40977a6b130b29a9d43b7c72d7c1aeebd9c10f70 40977a6b130b29a9d43b7c72d7c1aeebd9c10f70 2008-07-16T16:02:09-07:00 2008-07-05T16:22:48-07:00 Added view for throw_content spec Signed-off-by: Michael S. Klishin <michael@novemberain.com> f4beba1b6289bfc9f3e93aed4a1c5aec3e685761 Michael S. Klishin michael@novemberain.com e7df07b6f75e61fc0f8d958596ea502c1f774b27 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0b0f4f1431d0b6d950c5eeaeb5d311e706281f08 0b0f4f1431d0b6d950c5eeaeb5d311e706281f08 2008-07-16T15:15:40-07:00 2008-07-16T15:15:40-07:00 Clean up resource regexps after ; separator is gone. 25e2748732ef1299bbfd5c07db5e11f30d9239a7 Michael S. Klishin michael@novemberain.com ad7ba9bd7efe40d0e123a6a6476430440de3c4b0 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/e7df07b6f75e61fc0f8d958596ea502c1f774b27 e7df07b6f75e61fc0f8d958596ea502c1f774b27 2008-07-16T13:29:42-07:00 2008-07-16T13:29:42-07:00 @@parent_resources, not @@parent_resource cfb834035805e7c59e84e26e1caa7139e3d55f5c Michael S. Klishin michael@novemberain.com dc701bcfced392ce1d6b1cda7a51a2a9dd1b6d9d Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ad7ba9bd7efe40d0e123a6a6476430440de3c4b0 ad7ba9bd7efe40d0e123a6a6476430440de3c4b0 2008-07-16T12:20:59-07:00 2008-07-16T12:20:59-07:00 Semicolon as action separator for resources is no longer supported: breaks basic http auth in Safari. 9f6528f5e5fe2b8cfbe8ab629a07e7e9bc90df5f Michael S. Klishin michael@novemberain.com 5ae0124fd58464e668896335c5015b786fbb591c Daniel Neighman has.sox@gmail.com http://github.com/wycats/merb-core/commit/dc701bcfced392ce1d6b1cda7a51a2a9dd1b6d9d dc701bcfced392ce1d6b1cda7a51a2a9dd1b6d9d 2008-07-11T07:23:10-07:00 2008-07-11T07:23:10-07:00 Small doc update. Thanx jackdempsey 1ba543b7a74f8893f2fdb74e9a288581c25b98f7 Daniel Neighman has.sox@gmail.com 950ad54582e03bbf174498e21b2aa3254c1ae8fb Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/5ae0124fd58464e668896335c5015b786fbb591c 5ae0124fd58464e668896335c5015b786fbb591c 2008-07-09T16:17:07-07:00 2008-07-09T16:17:07-07:00 Adds message support (like flash in Rails but with somewhat different semantics) af594e0b32d92c94229fc0f07099e8658e058e10 Yehuda Katz wycats@gmail.com b2f7884058e4c9c51e6713157fcd5b79f396798b Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/950ad54582e03bbf174498e21b2aa3254c1ae8fb 950ad54582e03bbf174498e21b2aa3254c1ae8fb 2008-07-09T16:15:29-07:00 2008-07-09T16:15:29-07:00 Add .tmproj to the list of ignores 5c005dff95ac790f1f91ea83d10375abd3d08280 Yehuda Katz wycats@gmail.com 3804f0c5b081a26f2b34d3eb89a1dd4634a3785a Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/b2f7884058e4c9c51e6713157fcd5b79f396798b b2f7884058e4c9c51e6713157fcd5b79f396798b 2008-07-06T22:35:19-07:00 2008-07-06T22:35:19-07:00 Fix bug with :status 6e12b0aea1b6f534b6f76191cb7256587ca26c26 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local e277dc9938996065697e6dcd888fe4fefeeaaed5 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/3804f0c5b081a26f2b34d3eb89a1dd4634a3785a 3804f0c5b081a26f2b34d3eb89a1dd4634a3785a 2008-07-06T21:50:54-07:00 2008-07-06T21:50:54-07:00 Spec for :status in display 5676ae7ff2e0d52381e8f36587c5bcb92cbc32b5 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local bd11c0b50efaac539606103fe6702a4aaa3ba9ef 0d50ec2931d474acfeaf8138edcd65dd919e752d Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/e277dc9938996065697e6dcd888fe4fefeeaaed5 e277dc9938996065697e6dcd888fe4fefeeaaed5 2008-07-06T21:30:22-07:00 2008-07-06T21:30:22-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 804d0a85122528b3421234c0dd014a81ef5cc837 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 522e920c75f927bec7b4d7afcd1bca4b7c097987 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/bd11c0b50efaac539606103fe6702a4aaa3ba9ef bd11c0b50efaac539606103fe6702a4aaa3ba9ef 2008-07-06T21:30:15-07:00 2008-07-06T21:30:15-07:00 display handles :status and :location 749fe0b283f6c23dcd6d11fef786daf6e269429b Yehuda Katz wycats@yehuda-katzs-macbook-pro.local aae145a39e5bdb3e3a061861cd0ad566ca8f4310 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0d50ec2931d474acfeaf8138edcd65dd919e752d 0d50ec2931d474acfeaf8138edcd65dd919e752d 2008-07-05T14:59:50-07:00 2008-07-05T14:59:50-07:00 Improved RDoc of Merb#load_dependencies. 189a827a485a0bfd9f29a18a478077ada2441da3 Michael S. Klishin michael@novemberain.com 8d73e3baa5ff6bf8149ea01d07d55033e8737cfa Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/aae145a39e5bdb3e3a061861cd0ad566ca8f4310 aae145a39e5bdb3e3a061861cd0ad566ca8f4310 2008-07-05T14:54:37-07:00 2008-07-05T14:54:37-07:00 script/frozen-merb => merb-freezer in RDoc 6fc154f43b8efe464733ee844da4106f9fd1383d Michael S. Klishin michael@novemberain.com 49ee3a781e25cfd4dde46a417e1d66c3575be540 3951c85b5876556a8e2527967115ac1375b5aa21 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/8d73e3baa5ff6bf8149ea01d07d55033e8737cfa 8d73e3baa5ff6bf8149ea01d07d55033e8737cfa 2008-07-05T14:52:57-07:00 2008-07-05T14:52:57-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Adjusted logging message for thin sockets vs ports. Added socket option to thin.rb and to the command line options. 16ea90bc67cc41e83d95a1c6ea348f90abab0ac6 Michael S. Klishin michael@novemberain.com 4d93d323203a323365e7ae915c73b5f2bc107796 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/3951c85b5876556a8e2527967115ac1375b5aa21 3951c85b5876556a8e2527967115ac1375b5aa21 2008-07-05T11:20:46-07:00 2008-07-05T11:20:46-07:00 Adjusted logging message for thin sockets vs ports. e1256d414e1ed37acfb4266d0c281a2adf701b08 Wayne E. Seguin wayneeseguin@gmail.com 522e920c75f927bec7b4d7afcd1bca4b7c097987 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/4d93d323203a323365e7ae915c73b5f2bc107796 4d93d323203a323365e7ae915c73b5f2bc107796 2008-07-05T11:12:02-07:00 2008-07-05T11:12:02-07:00 Added socket option to thin.rb and to the command line options. 02f76029e9bb50b8f4e4eea0e1e019c4541dcaa2 Wayne E. Seguin wayneeseguin@gmail.com 4618d8d0ab8f80848a486e198b55a2cb2d3c556c 522e920c75f927bec7b4d7afcd1bca4b7c097987 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/49ee3a781e25cfd4dde46a417e1d66c3575be540 49ee3a781e25cfd4dde46a417e1d66c3575be540 2008-07-04T13:05:59-07:00 2008-07-04T13:05:59-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: send_file opens files in 'rb' binary mode so windows doesn't shit itself 694c7c0a4855c49948e00563e9264dc66f14a99b Michael S. Klishin michael@novemberain.com e9007356dde3824ef6ea18a0e9d8796d44251f07 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/522e920c75f927bec7b4d7afcd1bca4b7c097987 522e920c75f927bec7b4d7afcd1bca4b7c097987 2008-06-30T16:52:33-07:00 2008-06-30T16:52:33-07:00 send_file opens files in 'rb' binary mode so windows doesn't shit itself e49c3f57d48021b5166feb1ebde84aa64519f9d8 Ezra Zygmuntowicz ez@engineyard.com 9778c2109288e66673f1c4846917d5e8aeb54626 e9007356dde3824ef6ea18a0e9d8796d44251f07 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/4618d8d0ab8f80848a486e198b55a2cb2d3c556c 4618d8d0ab8f80848a486e198b55a2cb2d3c556c 2008-06-29T09:58:47-07:00 2008-06-29T09:58:47-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: fix nginx_send_file FileUtils#touch only added mtime option in ruby 1.8.6. let's use File#utime instead 9e432f2ebc549f61e9d258b8d023eca27699e262 Michael S. Klishin michael@novemberain.com 25feab1369eecf5dfa2bbe3a7453f39d9b5e376e 3310cfaf88870f305a4e7e1c34145aa3146199d7 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/e9007356dde3824ef6ea18a0e9d8796d44251f07 e9007356dde3824ef6ea18a0e9d8796d44251f07 2008-06-28T23:03:52-07:00 2008-06-28T23:03:07-07:00 Use File.utime instead of FileUtils#touch for 1.8.5 compatibility. 27bde99f3d8a290852619a345a2246b5f85df3f6 Michael S. Klishin michael@novemberain.com eea5ce624df1fda523aad0437e70444b55e0d4a9 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/25feab1369eecf5dfa2bbe3a7453f39d9b5e376e 25feab1369eecf5dfa2bbe3a7453f39d9b5e376e 2008-06-28T12:46:27-07:00 2008-06-28T12:46:27-07:00 fix nginx_send_file cbc5a21ef9090cd68009e5dab325d04a27240cb9 Ezra Zygmuntowicz ez@engineyard.com d1a25440cf10474f07a8a0aa03a82a9d72533961 eea5ce624df1fda523aad0437e70444b55e0d4a9 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/9778c2109288e66673f1c4846917d5e8aeb54626 9778c2109288e66673f1c4846917d5e8aeb54626 2008-06-28T04:25:56-07:00 2008-06-28T04:25:56-07:00 Merge branch 'master' of git@github.com:wycats/merb-core * 'master' of git@github.com:wycats/merb-core: Spec for previously applied patch to Behavior#defer_to. use Route#register in defer_to so that deferred routes get an index Make Autotest ignore doc/ as well. Ensure Autotest ignores changes in log directory. Add helpers directory to load path Modules don't get duped right. Redo Merb's inheritable_accessors so that they have correct semantics, then redo everything that uses inheritable_accessors so they don't have to hack around the bad semantics. Added spec for the route matcher testing regexp routes. [#386] Add Merb.started? alias for Merb.started reader. Add reader for @started flag which shows when Merb environment is started. ebd079a5820f5ff8b1ce63ae6dda3084e59465b7 Michael S. Klishin michael@novemberain.com 4255bdbc4aa107775ea8cec5fac43fdf92b22829 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/eea5ce624df1fda523aad0437e70444b55e0d4a9 eea5ce624df1fda523aad0437e70444b55e0d4a9 2008-06-28T04:12:36-07:00 2008-06-28T04:12:36-07:00 Spec for previously applied patch to Behavior#defer_to. b3e2d128d82f752a034fd2fa26c7d40eb9dbf698 Michael S. Klishin michael@novemberain.com 6c350138fe7e05ac2069a069719eb3d07ebe04a3 Shalon Wood dstar@pele.cx http://github.com/wycats/merb-core/commit/4255bdbc4aa107775ea8cec5fac43fdf92b22829 4255bdbc4aa107775ea8cec5fac43fdf92b22829 2008-06-28T03:53:23-07:00 2008-06-18T09:35:41-07:00 use Route#register in defer_to so that deferred routes get an index Signed-off-by: Michael S. Klishin <michael@novemberain.com> 0bf275442a87822ddb0d501b8fec7f184f74349f Michael S. Klishin michael@novemberain.com 4982a0aaf86eb5e0246816a87782bf4266dc88a5 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/6c350138fe7e05ac2069a069719eb3d07ebe04a3 6c350138fe7e05ac2069a069719eb3d07ebe04a3 2008-06-28T03:49:26-07:00 2008-06-28T03:49:26-07:00 Make Autotest ignore doc/ as well. 776a84bf2ce67152c1b8e5ed0da47bf88c3f07c0 Michael S. Klishin michael@novemberain.com