219b283ea647c4524e5d909ebe36050735447be7 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/c99fae98e8b238e3288f41566458a27378c94ff5 c99fae98e8b238e3288f41566458a27378c94ff5

2008-03-24T20:47:34-07:00

bump versions on all sub Rakefiles 6e314171afe89f2372673d1362c4acc2ec07931a Michael D. Ivey ivey@gweezlebur.com fc141af9085b5c28c42c7e746f1241c22892b9de Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/219b283ea647c4524e5d909ebe36050735447be7 219b283ea647c4524e5d909ebe36050735447be7

2008-03-24T20:45:32-07:00

rakefile for 0.9.2 1741ac8579dbd4e02dff708ce0605f408cd6f304 Michael D. Ivey ivey@gweezlebur.com 30569d2d2708d6d8d21522fb2b220e87e8b4e663 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/fc141af9085b5c28c42c7e746f1241c22892b9de fc141af9085b5c28c42c7e746f1241c22892b9de

2008-03-24T20:44:23-07:00

Prep v0.9.2 7be2cba9110c706d9a61d6005993a8b1d8092fc8 Michael D. Ivey ivey@gweezlebur.com 7692d2d255e5136019354cdf4253f471ba54c53b Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/30569d2d2708d6d8d21522fb2b220e87e8b4e663 30569d2d2708d6d8d21522fb2b220e87e8b4e663

2008-03-24T20:10:21-07:00

2008-03-24T20:07:03-07:00

Fix merb-flat and merb-very-flat generators Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 7794f77e17e3c3b76a2b9c61efb7fbbedefd6739 Ezra Zygmuntowicz ez@engineyard.com 499843be741063a92e84240ed38b446f220b3725 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/7692d2d255e5136019354cdf4253f471ba54c53b 7692d2d255e5136019354cdf4253f471ba54c53b

2008-03-24T19:55:45-07:00

use %> not %%> 15e2b9231f72472463dccbaf8dbc9a1b90a7c3e2 Ezra Zygmuntowicz ez@engineyard.com d3ff63235e3866a6d37122816b237885e18a2e19 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/499843be741063a92e84240ed38b446f220b3725 499843be741063a92e84240ed38b446f220b3725

2008-03-24T19:31:21-07:00

2008-03-24T19:09:43-07:00

merb-gen no longer generates apps by default Refactored merb-gen to require the app option to generate an application. ie. merb-gen app myapp Added help option to merb-gen so that help is displayed for the given generator. ie. merb-gen help model merb-gen model -h # Still works too Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> be95eea445ca830a9308e6987fc5b424acf557d0 Ezra Zygmuntowicz ez@engineyard.com 9f0633790c6e31f1364b8bfa24cb30aa8d887eb9 3d78a8987b2588ee1cb7018d257233e958efd74b Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/d3ff63235e3866a6d37122816b237885e18a2e19 d3ff63235e3866a6d37122816b237885e18a2e19

2008-03-24T19:28:34-07:00

Merge branch 'master' of git@github.com:wycats/merb-more 5b9e73e545497af9acefdb14640044698f712269 Ezra Zygmuntowicz ez@engineyard.com bd6c7c6fe5ac4d5e14f740cdece35b0ad288ce58 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/9f0633790c6e31f1364b8bfa24cb30aa8d887eb9 9f0633790c6e31f1364b8bfa24cb30aa8d887eb9

2008-03-24T19:27:54-07:00

fix templates so merb-gen will work. f2f8adbdca9ae392122333378ba5d7699c35c7cd Ezra Zygmuntowicz ez@engineyard.com 555600f7767a81310b589132fc4eccd2b582cc93 bd6c7c6fe5ac4d5e14f740cdece35b0ad288ce58 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/3d78a8987b2588ee1cb7018d257233e958efd74b 3d78a8987b2588ee1cb7018d257233e958efd74b

2008-03-24T18:51:45-07:00

Merge branch 'master' of git@github.com:wycats/merb-more 1dc27b7645f3f1aede76d95a7c37536012a174ee booss alex.boussinet@gmail.com aa31d730ea0e2d3736288c9e324ad43ee638899b booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/555600f7767a81310b589132fc4eccd2b582cc93 555600f7767a81310b589132fc4eccd2b582cc93

2008-03-24T18:50:45-07:00

cache_action and cache_page should only set cache for 200 responses (closing #207) added abort_cache_action to prevent caching the action after it has been rendered. added abort_cache_page to prevent caching the page after it has been rendered. 2f33621b3ae70839368bcd8a0ef0a0824c98dbe2 booss alex.boussinet@gmail.com e24d6c788eda0706ba572bdaeccc59b44cc20fd7 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/bd6c7c6fe5ac4d5e14f740cdece35b0ad288ce58 bd6c7c6fe5ac4d5e14f740cdece35b0ad288ce58

2008-03-24T17:21:58-07:00

use Dir.chdir(dir){ sh "#{SUDO} rake install" } for windows compat in rakefile 4443c8392541731addb2428e3adf7f9a0289d7f9 Ezra Zygmuntowicz ez@engineyard.com e2b7df19f01e73eab6c3acfadd7bc6a70ff7c78c c5ffaee9beb6a1cd53fd65741f682c5f40d13e64 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/e24d6c788eda0706ba572bdaeccc59b44cc20fd7 e24d6c788eda0706ba572bdaeccc59b44cc20fd7

2008-03-24T17:19:18-07:00

merge drnics MERB_ROM stuff for merb-gen 8e24810ef5feb06caa9191fe91bad5dbe8bd688c Ezra Zygmuntowicz ez@engineyard.com ec222f4e0b13b20fbe88e1304ac59732bd0b3800 a0e3b203a6acfd2b12400f146b125473e6e7da6d Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/e2b7df19f01e73eab6c3acfadd7bc6a70ff7c78c e2b7df19f01e73eab6c3acfadd7bc6a70ff7c78c

2008-03-24T17:14:32-07:00

add freeze task to the app rakefiles to freeze as git submoduels. 874b0377af7d2a745e161d23b885534abaa19326 Ezra Zygmuntowicz ez@engineyard.com 71b86f9cf65f22ed853df5102574f60fe8c6085d Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/ec222f4e0b13b20fbe88e1304ac59732bd0b3800 ec222f4e0b13b20fbe88e1304ac59732bd0b3800

2008-03-24T17:11:44-07:00

ok since merb-haml is in -more we will use Merb::Config not Merb::Plugin.config sorry for the bouncing back and forth this is where it will stay. Also updated sass to allow for Merb::Config[:sass] to work 64d4e190fc5048390c9a9f7bd10b8d65d960e17d Ezra Zygmuntowicz ez@engineyard.com aa31d730ea0e2d3736288c9e324ad43ee638899b Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/71b86f9cf65f22ed853df5102574f60fe8c6085d 71b86f9cf65f22ed853df5102574f60fe8c6085d

2008-03-24T17:04:40-07:00

2008-03-09T12:59:52-07:00

Set mongrel as default adapter unless other alternative options are specified Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 9197b367957def0b74fae520c1b7ac32822ff552 Ezra Zygmuntowicz ez@engineyard.com e4d8962df5756d72f2b3bcbed78ed1bd9844b0c1 9f8e7ce977d2fffff92d01b58549b2556ff15e41 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/aa31d730ea0e2d3736288c9e324ad43ee638899b aa31d730ea0e2d3736288c9e324ad43ee638899b

2008-03-24T16:59:11-07:00

Merge branch 'freezergenfix' of git://github.com/lachie/merb-more 2fca86eb886f91efa6af81f5fe4d7e01e4abcdcf Ezra Zygmuntowicz ez@engineyard.com 87c874c59b6a44ec4f5c75fd768c0f7888740ee8 James Herdman james.herdman@gmail.com http://github.com/wycats/merb-more/commit/e4d8962df5756d72f2b3bcbed78ed1bd9844b0c1 e4d8962df5756d72f2b3bcbed78ed1bd9844b0c1

2008-03-24T16:55:44-07:00

2008-03-14T17:11:21-07:00

Clean up Merb-Gen Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 0d418323171e01a02fb512e88b58d17c47f1a1ae Ezra Zygmuntowicz ez@engineyard.com 36a49f6aaf44ce17dd3c27935310d81fd0b9da82 James Herdman james.herdman@gmail.com http://github.com/wycats/merb-more/commit/87c874c59b6a44ec4f5c75fd768c0f7888740ee8 87c874c59b6a44ec4f5c75fd768c0f7888740ee8

2008-03-24T16:53:39-07:00

2008-03-14T16:09:10-07:00

Added Autotest mappings for full Merb applications for both the RSpec and Test/Unit libraries. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 8740c1ce100169b2266f03e2f3683cbc327fc2f0 Ezra Zygmuntowicz ez@engineyard.com e2574d9776dd9804f6645cd2aa83e7d09206c672 Rob Ares rob.ares@gmail.com http://github.com/wycats/merb-more/commit/36a49f6aaf44ce17dd3c27935310d81fd0b9da82 36a49f6aaf44ce17dd3c27935310d81fd0b9da82

2008-03-24T16:52:52-07:00

2008-03-19T17:54:26-07:00

Removing un-needed js comment sequence from bundled asset tag. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> d691c4de6ccc98b95bcef59cc51cd759fc22a0fc Ezra Zygmuntowicz ez@engineyard.com 1e55c23a1184b56b307afcd505a4e262b599283c Debian User nicos@elysium.(none) http://github.com/wycats/merb-more/commit/e2574d9776dd9804f6645cd2aa83e7d09206c672 e2574d9776dd9804f6645cd2aa83e7d09206c672

2008-03-24T16:45:42-07:00

2008-03-22T06:23:45-07:00

merb-more rake install task escalates user privileges too early Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 29f9ef9f0242772134fec45e0fb08ef630cd850a Ezra Zygmuntowicz ez@engineyard.com b5467e5138b8c18c0c521a5fce5ea529f1a090d6 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/1e55c23a1184b56b307afcd505a4e262b599283c 1e55c23a1184b56b307afcd505a4e262b599283c

2008-03-24T16:27:49-07:00

don't reload classes in test mode 02e99daeb1c41f5beeb0ae21b94a08f758b47f4d Ezra Zygmuntowicz ez@engineyard.com 3a13dac3bfdb4e37d20095e254f36437fcf0cc84 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/b5467e5138b8c18c0c521a5fce5ea529f1a090d6 b5467e5138b8c18c0c521a5fce5ea529f1a090d6

2008-03-24T16:17:33-07:00

fix up merb-fcgi binary to work out of the box b201cfab820b88a522c79ded9239eba53625ee28 Ezra Zygmuntowicz ez@engineyard.com df04185c17e981aa4c7f86b5a7e21e74aafc3ce9 Martin Grund grund@MacGrund.local http://github.com/wycats/merb-more/commit/3a13dac3bfdb4e37d20095e254f36437fcf0cc84 3a13dac3bfdb4e37d20095e254f36437fcf0cc84

2008-03-24T16:15:03-07:00

2008-03-24T10:44:22-07:00

* adds implementation for #220 * modifies merb.fcgi to enable really working with fcgi setups * adds default .htaccess that manages the redirection to the CGI script Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 08a3e1101c6437f8d5bb6bc774b0c0caf8cf1f2c Ezra Zygmuntowicz ez@engineyard.com df2123a1fad10bceb52404b9a26da9045c76d980 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/df04185c17e981aa4c7f86b5a7e21e74aafc3ce9 df04185c17e981aa4c7f86b5a7e21e74aafc3ce9

2008-03-24T16:13:28-07:00

use __send__ not send, use require in merb-haml 0dd290a45c889b6e66ff8304564e9d41d48fad95 Ezra Zygmuntowicz ez@engineyard.com 00ed43b22cb22fc48bb28399e8e057bfc5970e87 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/df2123a1fad10bceb52404b9a26da9045c76d980 df2123a1fad10bceb52404b9a26da9045c76d980

2008-03-24T16:08:47-07:00

2008-03-24T15:03:00-07:00

Fix merb-haml spec to pull proper config Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 58e7cef5095d250d60942d5d8037cfc5beb1d64e Ezra Zygmuntowicz ez@engineyard.com b8cc233cb459054ea4368f71d9485c20c041c2b3 Seth Thomas Rasmussen sethrasmussen@gmail.com http://github.com/wycats/merb-more/commit/00ed43b22cb22fc48bb28399e8e057bfc5970e87 00ed43b22cb22fc48bb28399e8e057bfc5970e87

2008-03-24T16:07:15-07:00

2008-03-24T09:08:00-07:00

Fix action-args to honor controller actions defined using :define_method A host of other cleanups including fixes to allow the action-args spec to run at all as well as in isolation. Part of the changes to accomodate that included fixing some templates for merb-gen for some reason. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 6300173b5a151b2b27275043341629f6977740f2 Ezra Zygmuntowicz ez@engineyard.com 8e4a25f9a0bc859a6b8feb5e77d5368dd032966b Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/b8cc233cb459054ea4368f71d9485c20c041c2b3 b8cc233cb459054ea4368f71d9485c20c041c2b3

2008-03-22T15:45:05-07:00

fix merb-more rakefiles, fix haml config options 713f78558947af4636a6aa405b9197b5b97cf38b Ezra Zygmuntowicz ez@engineyard.com 9a54e81a254c6525e3c925e050d4756e498788ad Ho-Sheng Hsiao hosh@isshen.com http://github.com/wycats/merb-more/commit/8e4a25f9a0bc859a6b8feb5e77d5368dd032966b 8e4a25f9a0bc859a6b8feb5e77d5368dd032966b

2008-03-21T15:38:07-07:00

2008-03-20T22:30:27-07:00

Added support for charset in css_include_tag Added support for the charset attribute in the css_include_tag helper of merb-assets. It will Now default to utf-8. To change the charset, pass :charset to the helper. Examples: css_include_tag 'style' => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" charset="utf-8" /> css_include_tag 'style', :charset => 'iso-8895-1' => <link href="/stylesheets/style.css" media="all" rel="Stylesheet" type="text/css" charset="iso-8895-1" /> Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 24298ff72c267b73604306c9b21b4524c3618a49 Ezra Zygmuntowicz ez@engineyard.com 450d0cfe957357ca0e2bc8d7c0b47c1c4569008e booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/9a54e81a254c6525e3c925e050d4756e498788ad 9a54e81a254c6525e3c925e050d4756e498788ad

2008-03-16T00:16:37-07:00

added merb-cache to the array of gems in Rakefile. closing #79 d9f7e99ac956908bfb061d41dff762debdbe6ea0 booss alex.boussinet@gmail.com bb6eb59fa4b037b0e88ae4e1976de518fd717d55 209c802d76df965349d6867c3fb184baa83c2ddb booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/450d0cfe957357ca0e2bc8d7c0b47c1c4569008e 450d0cfe957357ca0e2bc8d7c0b47c1c4569008e

2008-03-15T23:50:52-07:00

Merge branch 'master' of git@github.com:wycats/merb-more f53628a2bc6cbf95268e515dc5618495aa9129f3 booss alex.boussinet@gmail.com