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
merb-more / Commit History feed

10/06/08

Merge branch 'master' of git@github.com:wycats/merb-more
mattetti (author)
Mon Oct 06 22:35:20 -0700 2008
commit  32daa3187922656b2aba787159c81a90c2fb654a
tree    27d800b94aa949a8beea8697ad4a2a717c67626a
parent  add22cf93e982aa8c80f967816971d7e8e2ab28f parent  02ba91982cd485019cf2a3a703ff3951b2c8da85 
Moved more specs to full stack specs
mattetti (author)
Mon Oct 06 22:34:23 -0700 2008
commit  add22cf93e982aa8c80f967816971d7e8e2ab28f
tree    c6812c27d9e90424cfce036ffba1e64d80f9943c
parent  462369c5d8f244873aef1352a24410c20ecf0321 
Tell merb-gen merb_full app generator about htaccess since it isn't picked 
up by default
ivey (author)
Mon Oct 06 20:28:25 -0700 2008
commit  02ba91982cd485019cf2a3a703ff3951b2c8da85
tree    03fa3540fee575cd13af3242383d64c49c7c6e2c
parent  bef3a6fc47a0c7fe83be54f69895952e175abc16 
Add staging environment to generated application skeleton (just a copy of 
production).
michaelklishin (author)
Mon Oct 06 11:26:52 -0700 2008
commit  bef3a6fc47a0c7fe83be54f69895952e175abc16
tree    13b5fce7a58f428cac0f174db1f14261830773ce
parent  462369c5d8f244873aef1352a24410c20ecf0321

10/05/08

optimized two_digits Numeric helper thanks to GMFlash
mattetti (author)
Sun Oct 05 23:50:52 -0700 2008
commit  462369c5d8f244873aef1352a24410c20ecf0321
tree    3c1496b463d5ba7b8ba060f108153479ce5fadba
parent  e76d7eb2b4ca45065bb990837fa60324055f7d27 
added minutes_to_hours and two_digits numeric helpers to merb-helpers
mattetti (author)
Sun Oct 05 22:13:25 -0700 2008
commit  e76d7eb2b4ca45065bb990837fa60324055f7d27
tree    bd6aad817e06a30269ad764f291af80c226330ed
parent  5ae7e4a23321bcad29ebccef7820b6e1b60e80e9 
Merge branch 'master' of git@github.com:wycats/merb-more
mattetti (author)
Sun Oct 05 21:15:30 -0700 2008
commit  5ae7e4a23321bcad29ebccef7820b6e1b60e80e9
tree    453b39850b30985cb816fa6411585f6095e212db
parent  2f9591af190b5b4550cd708df379336d98e455dc parent  0a4a3ab05a057b0e85de9d7e3b088372b112f4ed 
started moving some of the numeric extension helpers to full stack specs
mattetti (author)
Sun Oct 05 21:14:05 -0700 2008
commit  2f9591af190b5b4550cd708df379336d98e455dc
tree    303a483ad4f235f85af8f39c8009777d40b8036e
parent  9383f47c76665b6d4b299b66b31b68d8ad71ef8f 
support local assignment preambles in haml and builder templates
Drew Colthorp (author)
Sun Oct 05 16:16:48 -0700 2008
ezmobius (committer)
Sun Oct 05 20:11:28 -0700 2008
commit  0a4a3ab05a057b0e85de9d7e3b088372b112f4ed
tree    d292c8488ad0d0291969eec446c253e9d4b3796f
parent  61ba717de9c66daa4fda003526c22dc61c7761b6 
added documentation for delete_button (merb-helpers)
mattetti (author)
Sun Oct 05 19:27:33 -0700 2008
commit  9383f47c76665b6d4b299b66b31b68d8ad71ef8f
tree    2488b89cf7dadde8c1f14205c51c6f1eed88768e
parent  61ba717de9c66daa4fda003526c22dc61c7761b6 
updated test documentation for merb-helpers
mattetti (author)
Sun Oct 05 17:41:12 -0700 2008
commit  61ba717de9c66daa4fda003526c22dc61c7761b6
tree    ffbab9a3b82e5040948aab4a93cb5893ae880842
parent  387b255f31f26a5850886d773358b089c68435a9 
Merge branch 'master' of git@github.com:wycats/merb-more
fabien (author)
Sun Oct 05 14:48:19 -0700 2008
commit  387b255f31f26a5850886d773358b089c68435a9
tree    297eabae133557f48455a98b559e889305806c86
parent  0a3ad0b857c16380a227f4e991b2439400e2b81d parent  ed0a7938766344a2130d20e26770464a391b5730 
Reverted MinimalPrivilege in merb.thor for now
fabien (author)
Sun Oct 05 14:47:51 -0700 2008
commit  0a3ad0b857c16380a227f4e991b2439400e2b81d
tree    1b17666b4c7623657c690a9f832260442ace436f
parent  b9faa6b46b2b0f3d6dbe4590f35520857a10595f 
Added a Generators file to merb-mailer Comment
carllerche (author)
Sun Oct 05 13:11:24 -0700 2008
commit  ed0a7938766344a2130d20e26770464a391b5730
tree    313e62518243ad9d5d0aeafa1aa5c66e3a306076
parent  a6dd6070e64e0dbb157d29bd2705571bc63f98aa 
Changed the behaviour of AdhocStore#fetch, updated the specs
benburkert (author)
Sun Oct 05 12:56:42 -0700 2008
commit  a6dd6070e64e0dbb157d29bd2705571bc63f98aa
tree    1c6d3a6623c999f70fb56cd5bb70a4567a03fd29
parent  0120ebc68c0f6c7e3ee6ffc11f888f23ede94a1e 
Add support for custom cache key in fragment caching.
RichGuk (author)
Mon Sep 29 09:06:44 -0700 2008
benburkert (committer)
Sun Oct 05 12:51:19 -0700 2008
commit  0120ebc68c0f6c7e3ee6ffc11f888f23ede94a1e
tree    66202e5cd01b09cb2572f2e2a0b332b1d8985f87
parent  86ae8209d62f34e27ba2801d2c8b59c4eff11125 
Move fake models to fixtures/app/models. Sigh. Fake objects bring pain.
michaelklishin (author)
Sun Oct 05 09:33:26 -0700 2008
commit  86ae8209d62f34e27ba2801d2c8b59c4eff11125
tree    71c8ed6cf2653982751736259ddc34a9ef2e3fd3
parent  5d0f4ab221a6f05cc0f238d8d935da056fed99a1 
Start moving merb-helpers fixtures towards a real app.
michaelklishin (author)
Sun Oct 05 09:18:23 -0700 2008
commit  5d0f4ab221a6f05cc0f238d8d935da056fed99a1
tree    fbaa4acc7e9be319d3206f0992648bada2954516
parent  b9faa6b46b2b0f3d6dbe4590f35520857a10595f 
Added MinimalPrivilege to merb.thor. Thanks namelessjon.
fabien (author)
Sun Oct 05 08:55:39 -0700 2008
commit  b9faa6b46b2b0f3d6dbe4590f35520857a10595f
tree    e1a9f7665141787e130acda0915eb622819d1f13
parent  9cad78d60ad52634ffbaacd76f3517d1ac388ded 
Bunch of improvements to merb-gen.
michaelklishin (author)
Sun Oct 05 07:52:08 -0700 2008
commit  9cad78d60ad52634ffbaacd76f3517d1ac388ded
tree    f735924a8f33a60728fa110fdc1a891a9aaceb64
parent  1b1ee40231ba3a4a8da5b0b6b09f3b06a742374c 
Generate controller spec for resource no matter what ORM is used (we do 
not have specific templates yet).
michaelklishin (author)
Sun Oct 05 06:07:44 -0700 2008
commit  1b1ee40231ba3a4a8da5b0b6b09f3b06a742374c
tree    73e92ae1721d9a1e275467ac381fbdc9d40e221a
parent  ce131713b0d791eb3185a78fd0105e35adf5fa43 
Handle migration numbers properly when --delete option is used.
michaelklishin (author)
Sun Oct 05 05:41:45 -0700 2008
commit  ce131713b0d791eb3185a78fd0105e35adf5fa43
tree    af5c9cae55dd8877585dcc002fd648d47bc62af6
parent  19dc44346a0366106766cb99df8d28da866238bc 
Add an edge case that reveals a bug in Extlib.
michaelklishin (author)
Sun Oct 05 05:05:20 -0700 2008
commit  19dc44346a0366106766cb99df8d28da866238bc
tree    79aca0e0c732466b48b34328759e7d099ff8471b
parent  d8955098c46585e02abc723f8dde0d9f5e43276b 
Remove extra puts in spec example.
michaelklishin (author)
Sun Oct 05 05:02:37 -0700 2008
commit  d8955098c46585e02abc723f8dde0d9f5e43276b
tree    ff7dde4269f448f25eaef0f3086a0815d701ac80
parent  a89e53106a96478b1211c607d287b1713692104c 
Spec examples for tag that prove #212 in -more is resolved.
michaelklishin (author)
Sun Oct 05 04:43:32 -0700 2008
commit  a89e53106a96478b1211c607d287b1713692104c
tree    1694b0b181b4297ef6ea4c7722c55b26f0eccf49
parent  f874e5d1c3696859cdcac5e6e8b820dcfa67593e 
Merge branch 'master' of git@github.com:wycats/merb-more
fabien (author)
Sun Oct 05 04:41:52 -0700 2008
commit  f874e5d1c3696859cdcac5e6e8b820dcfa67593e
tree    dd18528cbf9ddda5b02ca0751b42c3c6edc73ce7
parent  f63a86438c2dd8fd622155f41af388f3a54fefd8 parent  a014a3a215b623a3dfa07673e8c83cb7e4eb90c1 
reload_router! now uses Merb::BootLoader::Router.reload
fabien (author)
Sun Oct 05 04:40:53 -0700 2008
commit  f63a86438c2dd8fd622155f41af388f3a54fefd8
tree    af14fb27fe9b5f73d009a8934217ad718a2e6231
parent  f9369b1b20cc832318b48c48a67143c43ab83f7b 
Added some specs
fabien (author)
Sun Oct 05 03:16:18 -0700 2008
commit  f9369b1b20cc832318b48c48a67143c43ab83f7b
tree    7840db4f6e15c9b96896cd318e6e54fe2165f405
parent  a911ea6d323dff98740b5998dad82d27f0063424 
Update generated templates to mention merb-helpers (in merb-more), not 
merb_helpers.
michaelklishin (author)
Sun Oct 05 02:23:54 -0700 2008
commit  7ba7d7d4313478d776c7ffc6672c1a6cf1992979
tree    2cfbe3e92356e9cdefe23ffeb83237b3f6b2fbf0
parent  a911ea6d323dff98740b5998dad82d27f0063424 
Updated generator templates to include the correct output method of 
exceptions.
RichGuk (author)
Fri Oct 03 03:54:48 -0700 2008
michaelklishin (committer)
Sun Oct 05 02:54:43 -0700 2008
commit  a014a3a215b623a3dfa07673e8c83cb7e4eb90c1
tree    5cd8d6788ae49cda8dba0aadc63354698ddfb7a2
parent  7ba7d7d4313478d776c7ffc6672c1a6cf1992979