wycats / merb-more fork watch download tarball
public
Description: Merb More: The Full Stack. Take what you need; leave what you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/wycats/merb-more.git
Search Repo:
merb-more / Commit History feed

04/08/08

quick doc for github users
mattetti (author)
Tue Apr 08 23:50:24 -0700 2008
commit  f08c2d324af9c7bd875636b596343c0a4ab5f782
tree    1f0199d26bd5fe2965c3b54da595a91b7f9c91d5
parent  98bb0d5a33537f61adbba39d8467e0ff599f65b6 
moved the freezer rake tasks to merb-freezer
mattetti (author)
Tue Apr 08 23:43:04 -0700 2008
commit  98bb0d5a33537f61adbba39d8467e0ff599f65b6
tree    5d877b05994a6706f251e6c4d1220b8bef59ae49
parent  49ae567a0af1bcc24edfe012da935567e1cd77f3 
cleaned up the merb-gen TODO
mattetti (author)
Tue Apr 08 23:05:22 -0700 2008
commit  49ae567a0af1bcc24edfe012da935567e1cd77f3
tree    ce9f481e1b417cec673c05ad843948948772a3fd
parent  8c1c3112a024c91ecc706d70ccee3b82b464fa90 
Merge branch 'master' of git://github.com/wycats/merb-more + removed 
frozen merb generator since it got moved to its own plugin
mattetti (author)
Tue Apr 08 22:59:29 -0700 2008
commit  8c1c3112a024c91ecc706d70ccee3b82b464fa90
tree    59cc7c45642275b1091d3a2f7316737490464c91
parent  6f21837a541d01bc4c1cd4d5cdc878f5486ce290 parent  cc9090711a5b67b2c0214caa557252765cfca335 
removed the merb-frozen script generator since it's now available in the 
merb-freezer plugin
mattetti (author)
Tue Apr 08 22:40:25 -0700 2008
commit  6f21837a541d01bc4c1cd4d5cdc878f5486ce290
tree    a46faaf9af1ae33e18a17d4d276d4062515245e8
parent  11f3ef9c143f92ba74f44bd666ccabf519f5ed49 
Merge git://github.com/matta/merb-more
ezmobius (author)
Tue Apr 08 22:35:12 -0700 2008
commit  cc9090711a5b67b2c0214caa557252765cfca335
tree    37922b14dc2355739de923da964169f62e514ae8
parent  50a69836e00d388f084d2a3fab17b72c8fc5999b parent  11f3ef9c143f92ba74f44bd666ccabf519f5ed49 
added a merb-freezer README
mattetti (author)
Tue Apr 08 22:30:57 -0700 2008
commit  11f3ef9c143f92ba74f44bd666ccabf519f5ed49
tree    e75bd5d26ec1b1570f2eb4d7a76c658e08536a44
parent  d38b9897809380dbeff6c2b5616d6b4f2abd5efb 
moved the generated frozen merb script to merb-freezer
mattetti (author)
Tue Apr 08 21:56:26 -0700 2008
commit  d38b9897809380dbeff6c2b5616d6b4f2abd5efb
tree    97bc7b0458858f0ac384a33f584d4eac099cae20
parent  d9836c141784b3e73db0c1c08660d2673bcb0bae

04/06/08

merb-more rake install task escalates user privileges too early
Nicos Gollan (author)
Sat Apr 05 04:33:03 -0700 2008
ezmobius (committer)
Sun Apr 06 13:47:59 -0700 2008
commit  50a69836e00d388f084d2a3fab17b72c8fc5999b
tree    02d9f4c08a4ea4b61fb1f81116c820d173769ef8
parent  f4a843b7a4164e40f18bfcea25d7a770776aeaac

04/03/08

Fixed a bug where cache_{action,page} wouldn't work with multiple 
controllers (closing #90)
booss (author)
Thu Apr 03 02:28:28 -0700 2008
commit  f4a843b7a4164e40f18bfcea25d7a770776aeaac
tree    ca49a512df67361b6840f2b9e82255866febf584
parent  a42601791c45f045a7b3865b867a7b2141c7f0e2

03/31/08

Merge branch 'master' of git@github.com:wycats/merb-more
fabien (author)
Mon Mar 31 02:24:30 -0700 2008
commit  a42601791c45f045a7b3865b867a7b2141c7f0e2
tree    a1f7aee06bec0b53203adfcb6735a083c6a7e3d8
parent  b41f739d99035c1245aae777e348ffe7436ee89a parent  434dec90f8842f34b5a806e4621792137086da7e 
Added /log dir back to default app generator; logger auto-flush set to 
true (dev/test/rake env.)
fabien (author)
Mon Mar 31 02:23:10 -0700 2008
commit  b41f739d99035c1245aae777e348ffe7436ee89a
tree    78beb69d097a081b864a4c258dc869ce36174549
parent  3d7c86f8b7654b505e41c4adef1e198996f89839 
Fix unused literal issue, and that all tests wouldn't flash Growl (etc) as 
failed.
jherdman (author)
Sun Mar 30 12:01:56 -0700 2008
ezmobius (committer)
Mon Mar 31 02:08:52 -0700 2008
commit  434dec90f8842f34b5a806e4621792137086da7e
tree    92806441a641c9e8fae0e302d7e962463890b70e
parent  fe4120b2247ff393431a8ebe521ff6e7a08df7e9 
make merb.fcgi executable
ezmobius (author)
Mon Mar 31 02:08:36 -0700 2008
commit  fe4120b2247ff393431a8ebe521ff6e7a08df7e9
tree    369f2ac7dd5d30b5629e2c37a555c63774609b5f
parent  3d7c86f8b7654b505e41c4adef1e198996f89839

03/27/08

Resolved conflict.
wycats (author)
Thu Mar 27 08:08:36 -0700 2008
commit  3d7c86f8b7654b505e41c4adef1e198996f89839
tree    b1c1c0de98478d7cb3bd72fe73a394a2391c55f3
parent  0258dd02319698fa3a30ed6138395fc90aa5dfc1 parent  d87c825208e831f2cae153475d461c7f93ec39ba 
Small bug in existing impl.
wycats (author)
Thu Mar 27 08:05:46 -0700 2008
commit  0258dd02319698fa3a30ed6138395fc90aa5dfc1
tree    8416b112b4402a1a213d56c26283e8744c480b03
parent  2bb66a5c6b0b9c00ef8649afe6f1026b44a5fe06

03/25/08

Add mongrel as dependency of merb meta gem
daikini (author)
Tue Mar 25 10:10:48 -0700 2008
ivey (committer)
Tue Mar 25 10:37:45 -0700 2008
commit  d87c825208e831f2cae153475d461c7f93ec39ba
tree    29afd5f6801a127623634e5ed9d02ab5f95d3761
parent  c99fae98e8b238e3288f41566458a27378c94ff5

03/24/08

bump versions on all sub Rakefiles
ivey (author)
Mon Mar 24 20:47:34 -0700 2008
commit  c99fae98e8b238e3288f41566458a27378c94ff5
tree    6e314171afe89f2372673d1362c4acc2ec07931a
parent  219b283ea647c4524e5d909ebe36050735447be7 
rakefile for 0.9.2
ivey (author)
Mon Mar 24 20:45:32 -0700 2008
commit  219b283ea647c4524e5d909ebe36050735447be7
tree    1741ac8579dbd4e02dff708ce0605f408cd6f304
parent  fc141af9085b5c28c42c7e746f1241c22892b9de 
Prep v0.9.2
ivey (author)
Mon Mar 24 20:44:23 -0700 2008
commit  fc141af9085b5c28c42c7e746f1241c22892b9de
tree    7be2cba9110c706d9a61d6005993a8b1d8092fc8
parent  30569d2d2708d6d8d21522fb2b220e87e8b4e663 
Fix merb-flat and merb-very-flat generators
daikini (author)
Mon Mar 24 20:07:03 -0700 2008
ezmobius (committer)
Mon Mar 24 20:10:21 -0700 2008
commit  30569d2d2708d6d8d21522fb2b220e87e8b4e663
tree    7794f77e17e3c3b76a2b9c61efb7fbbedefd6739
parent  7692d2d255e5136019354cdf4253f471ba54c53b 
use %> not %%>
ezmobius (author)
Mon Mar 24 19:55:45 -0700 2008
commit  7692d2d255e5136019354cdf4253f471ba54c53b
tree    15e2b9231f72472463dccbaf8dbc9a1b90a7c3e2
parent  499843be741063a92e84240ed38b446f220b3725 
merb-gen no longer generates apps by default
daikini (author)
Mon Mar 24 19:09:43 -0700 2008
ezmobius (committer)
Mon Mar 24 19:31:21 -0700 2008
commit  499843be741063a92e84240ed38b446f220b3725
tree    be95eea445ca830a9308e6987fc5b424acf557d0
parent  d3ff63235e3866a6d37122816b237885e18a2e19 
Merge branch 'master' of git@github.com:wycats/merb-more
ezmobius (author)
Mon Mar 24 19:28:34 -0700 2008
commit  d3ff63235e3866a6d37122816b237885e18a2e19
tree    5b9e73e545497af9acefdb14640044698f712269
parent  9f0633790c6e31f1364b8bfa24cb30aa8d887eb9 parent  3d78a8987b2588ee1cb7018d257233e958efd74b 
fix templates so merb-gen will work.
ezmobius (author)
Mon Mar 24 19:27:54 -0700 2008
commit  9f0633790c6e31f1364b8bfa24cb30aa8d887eb9
tree    f2f8adbdca9ae392122333378ba5d7699c35c7cd
parent  bd6c7c6fe5ac4d5e14f740cdece35b0ad288ce58 
Merge branch 'master' of git@github.com:wycats/merb-more
booss (author)
Mon Mar 24 18:51:45 -0700 2008
commit  3d78a8987b2588ee1cb7018d257233e958efd74b
tree    1dc27b7645f3f1aede76d95a7c37536012a174ee
parent  555600f7767a81310b589132fc4eccd2b582cc93 parent  bd6c7c6fe5ac4d5e14f740cdece35b0ad288ce58 
cache_action and cache_page should only set cache for 200 responses 
(closing #207)
booss (author)
Mon Mar 24 18:50:45 -0700 2008
commit  555600f7767a81310b589132fc4eccd2b582cc93
tree    2f33621b3ae70839368bcd8a0ef0a0824c98dbe2
parent  aa31d730ea0e2d3736288c9e324ad43ee638899b 
use Dir.chdir(dir){ sh "#{SUDO} rake install" } for windows 
compat in rakefile
ezmobius (author)
Mon Mar 24 17:21:58 -0700 2008
commit  bd6c7c6fe5ac4d5e14f740cdece35b0ad288ce58
tree    4443c8392541731addb2428e3adf7f9a0289d7f9
parent  e24d6c788eda0706ba572bdaeccc59b44cc20fd7 
merge drnics MERB_ROM stuff for merb-gen
ezmobius (author)
Mon Mar 24 17:19:18 -0700 2008
commit  e24d6c788eda0706ba572bdaeccc59b44cc20fd7
tree    8e24810ef5feb06caa9191fe91bad5dbe8bd688c
parent  e2b7df19f01e73eab6c3acfadd7bc6a70ff7c78c parent  c5ffaee9beb6a1cd53fd65741f682c5f40d13e64 
add freeze task to the app rakefiles to freeze as git submoduels.
ezmobius (author)
Mon Mar 24 17:14:32 -0700 2008
commit  e2b7df19f01e73eab6c3acfadd7bc6a70ff7c78c
tree    874b0377af7d2a745e161d23b885534abaa19326
parent  ec222f4e0b13b20fbe88e1304ac59732bd0b3800 parent  a0e3b203a6acfd2b12400f146b125473e6e7da6d