GitHub Sale: sign up for any paid plan this week and pay nothing until January 1, 2009!  [ hide ]

auser / merb-core fork watch download tarball
public
Fork of wycats/merb-core
Description: Merb Core: All you need. None you don't.
Homepage: http://www.merbivore.com
Clone URL: git://github.com/auser/merb-core.git
merb-core / Commit History feed

02/13/08

Merge branch 'master' of git@github.com:wycats/merb-core
ivey (author)
Wed Feb 13 20:10:20 -0800 2008
commit  baf74321765d1ab799dc4a51f44766f6ad1a8e45
tree    b889c3cfaf30ac4b3161d6acf6f87523c429bf79
parent  ab721722d8d076c11190330b93f62c85f7f8a074 parent  8abb459d89ccb6061fa9dc59c380823619de1706 
Added some rdoc documentation to the Behavior class
dscataglini (author)
Wed Feb 13 19:16:13 -0800 2008
ivey (committer)
Wed Feb 13 20:07:23 -0800 2008
commit  ab721722d8d076c11190330b93f62c85f7f8a074
tree    6e932b46643f7269b336b807e368af4f27a8b324
parent  c694ac78a188037cdaf4584c3dc2fd37b613b541 
Add back support for streaming when using Mongrel or evented mongrel
ezmobius (author)
Wed Feb 13 18:06:57 -0800 2008
commit  8abb459d89ccb6061fa9dc59c380823619de1706
tree    e2308b970c53f0c54731eacc31683f0138fce10f
parent  a15b2e9aa1eb31f0a3fa7b2568f3ed25968e8433 
No longer need the response object in Dispatcher
ezmobius (author)
Wed Feb 13 14:27:00 -0800 2008
commit  a15b2e9aa1eb31f0a3fa7b2568f3ed25968e8433
tree    f33dce37aae0bd88796d3661e93f3477a606424f
parent  ab2c368f9296531260530fc054fe89ef6c7b7d17 
Remove the @response object as we do not need it.
ezmobius (author)
Wed Feb 13 14:23:33 -0800 2008
commit  ab2c368f9296531260530fc054fe89ef6c7b7d17
tree    14400c412c8c82b4ab3a299b47c2d9ea5b0e6cbb
parent  c694ac78a188037cdaf4584c3dc2fd37b613b541 
Merge branch 'master' of git@github.com:wycats/merb-core
ivey (author)
Wed Feb 13 14:00:16 -0800 2008
commit  c694ac78a188037cdaf4584c3dc2fd37b613b541
tree    ddb2282997d73510721206294fee9c5c32882e1c
parent  b3d1385cd1b950d1ce32e709cc1b937d1755c3d1 parent  f9b8d869671346f68f64c01db29106e0e56ed20c 
Server documentation
Janne Asmala (author)
Tue Feb 12 22:50:22 -0800 2008
ivey (committer)
Wed Feb 13 13:57:16 -0800 2008
commit  b3d1385cd1b950d1ce32e709cc1b937d1755c3d1
tree    04d99370e31cbcab57c204f5d0e30eb203cf5775
parent  bdfa396c8c4c6dda7a9a4a3a7adaa30b8d39fb85 
Fix conflict
wycats (author)
Wed Feb 13 11:48:05 -0800 2008
commit  f9b8d869671346f68f64c01db29106e0e56ed20c
tree    9244f3a93f5f83fcb6c4c95eb8df5803596fc5fe
parent  39973931efc14ed19445b64dc3ee4296e8c5b82f parent  bdfa396c8c4c6dda7a9a4a3a7adaa30b8d39fb85 
Make query-strings actually work
wycats (author)
Wed Feb 13 11:46:44 -0800 2008
commit  39973931efc14ed19445b64dc3ee4296e8c5b82f
tree    8d9d1fec40102e99c1221348dfaf53f0b206e1af
parent  a35e3427181f46dcd75a3fb419a9ed45a8cdb963 
Fix for merb.url in merb console causing the error
daikini (author)
Wed Feb 13 08:55:22 -0800 2008
commit  bdfa396c8c4c6dda7a9a4a3a7adaa30b8d39fb85
tree    1caaaa691b1a64a76ebfbf4cd6bc59c8a8cba603
parent  d1d519fe19dcd2d58d349f4216c642588278997d 
Merge branch 'master' of git@github.com:wycats/merb-core
ivey (author)
Wed Feb 13 07:55:51 -0800 2008
commit  d1d519fe19dcd2d58d349f4216c642588278997d
tree    b328533aef28097d6e0aa3e883fe678d9e4a241a
parent  69b0af440c26bf218c1098461df2fb398e129909 parent  6e5c54fe6390ed1c250b0e839b16cf83c32d172b 
Merge branch 'master' of git@github.com:wycats/merb-core
ezmobius (author)
Wed Feb 13 01:23:28 -0800 2008
commit  6e5c54fe6390ed1c250b0e839b16cf83c32d172b
tree    2f84fddd5fa98e202d391736c73c466fb01bbb84
parent  ad3e06a43829672f554bcf0d8bdc21154f9c9538 parent  2668a7dc953d2b32f2a76e522988b9aefccc9d39 
minor refactor
ezmobius (author)
Wed Feb 13 01:23:05 -0800 2008
commit  ad3e06a43829672f554bcf0d8bdc21154f9c9538
tree    0c8c7b095e91c9bca2ae952730a5eccfbabb81c1
parent  f6221a29e05685344d67146ca9ec7bd12b9abb47 
Add Merb.frozen and change how dependency() works when frozen? == true
ivey (author)
Wed Feb 13 00:03:30 -0800 2008
commit  69b0af440c26bf218c1098461df2fb398e129909
tree    0386d6818c1f2cb037fea819a92ba8c79e991810
parent  2668a7dc953d2b32f2a76e522988b9aefccc9d39

02/12/08

Removed sample apps, moving to merb-gen.
shayarnett (author)
Tue Feb 12 11:22:14 -0800 2008
ivey (committer)
Tue Feb 12 21:41:30 -0800 2008
commit  2668a7dc953d2b32f2a76e522988b9aefccc9d39
tree    80707e81f89d15df65d1cd4c38f298206a2cbda6
parent  ecf073ffefe9b59d490f4ab3be2784ea8818b7fc 
Added documentation for Config and Exceptions.
Janne Asmala (author)
Tue Feb 12 21:01:25 -0800 2008
ivey (committer)
Tue Feb 12 21:16:53 -0800 2008
commit  ecf073ffefe9b59d490f4ab3be2784ea8818b7fc
tree    615bb477cdfbcdfe2e9e847e16cf5094b2fb766b
parent  7551b32f2390cef055f664e75c9d9aafbe3e9464 
Hash#environmentize_keys! will ignore nil keys
ivey (author)
Tue Feb 12 21:04:26 -0800 2008
commit  7551b32f2390cef055f664e75c9d9aafbe3e9464
tree    85c6a999c1f7bf49dfed97ed393f171e2aa17525
parent  414d44d81489232e7e65b3ff84499ea0d476b70e 
Merge branch 'master' of git@github.com:wycats/merb-core
ivey (author)
Tue Feb 12 20:40:55 -0800 2008
commit  414d44d81489232e7e65b3ff84499ea0d476b70e
tree    2f2e71471dd2396153bc4cd2f460716f1a4dabcc
parent  670e2c6a830615c02576a2a4d7179f2fb84a38a7 parent  f6221a29e05685344d67146ca9ec7bd12b9abb47 
someone forgot to add ostruct
ivey (author)
Tue Feb 12 20:38:25 -0800 2008
commit  670e2c6a830615c02576a2a4d7179f2fb84a38a7
tree    2f2e71471dd2396153bc4cd2f460716f1a4dabcc
parent  f30da42347fb8547f4514f9970f05604790b95b5 
added spec for single resource
tooky (author)
Tue Feb 12 03:39:53 -0800 2008
ivey (committer)
Tue Feb 12 20:20:24 -0800 2008
commit  2bcf951fce21c554cb39dfb1419206201f007b30
tree    14b965a99a52bc3da38ecb2c7900009114875e69
parent  3a9c3d7e95f44c2083547ba055077b221ba66236 
Allow Merb.root_path to take a list of directories
dudleyf (author)
Tue Feb 12 09:15:26 -0800 2008
ivey (committer)
Tue Feb 12 20:20:24 -0800 2008
commit  cb5e21f071c077268c32b658c4695c86839ee7d3
tree    e4f718fe76dd644832f9c39475f365495d9b8925
parent  2bcf951fce21c554cb39dfb1419206201f007b30 
Remove DOC annotations and funky formatting, meh
ezmobius (author)
Tue Feb 12 20:15:46 -0800 2008
ivey (committer)
Tue Feb 12 20:20:24 -0800 2008
commit  f30da42347fb8547f4514f9970f05604790b95b5
tree    618c006fa3d5183fa19b8eaf4ebd89c3222f8e7d
parent  dc83419bf5f16e3f58e2fe9fc7bbcfd7b71bbc0f 
Fix rendering partials from a different controller, e.g: 
partial('other_controller/partial.html.erb')
dudleyf (author)
Tue Feb 12 17:48:49 -0800 2008
ivey (committer)
Tue Feb 12 20:20:24 -0800 2008
commit  cdbf6e8fe7eee4ae751d8e29b1400bafaa472452
tree    ea7ae8cf6d08e7edb844d0892d310207d29510fe
parent  cb5e21f071c077268c32b658c4695c86839ee7d3 
Allow for running specs with different Ruby implementations
dudleyf (author)
Tue Feb 12 08:46:48 -0800 2008
ivey (committer)
Tue Feb 12 20:20:24 -0800 2008
commit  dc83419bf5f16e3f58e2fe9fc7bbcfd7b71bbc0f
tree    5324f1b6e7fe7cc9d5fb9d3015941d763e27e079
parent  cdbf6e8fe7eee4ae751d8e29b1400bafaa472452 
added restful delete action
tooky (author)
Tue Feb 12 01:30:29 -0800 2008
ivey (committer)
Tue Feb 12 20:20:23 -0800 2008
commit  771e464a71d6309098def4754a25124408a28700
tree    f4efa45395ce043c0756f80af92784b21e94f87a
parent  d6afdf2cce03c26fca912de57e6d112aaf2dcfd2 
added routing for delete action on single resource
tooky (author)
Tue Feb 12 01:48:02 -0800 2008
ivey (committer)
Tue Feb 12 20:20:23 -0800 2008
commit  3a9c3d7e95f44c2083547ba055077b221ba66236
tree    473872d483d4efe83df5afb05c0a231611dc979e
parent  771e464a71d6309098def4754a25124408a28700 
Remove DOC annotations and funky formatting, meh
ezmobius (author)
Tue Feb 12 20:15:46 -0800 2008
commit  f6221a29e05685344d67146ca9ec7bd12b9abb47
tree    02b386f27074259a97d2086a7314070e02ea9547
parent  9c8000fbc06dca856a493a5aadfa96e762ff425c 
Allow for running specs with different Ruby implementations
dudleyf (author)
Tue Feb 12 08:46:48 -0800 2008
ezmobius (committer)
Tue Feb 12 18:05:41 -0800 2008
commit  9c8000fbc06dca856a493a5aadfa96e762ff425c
tree    89d1e7ac342b9fa2066908f7969d20e514378183
parent  497cf18fcd67b546d318893a05de8e55fd2fb02e 
Fix rendering partials from a different controller, e.g: 
partial('other_controller/partial.html.erb')
dudleyf (author)
Tue Feb 12 17:48:49 -0800 2008
ezmobius (committer)
Tue Feb 12 18:04:56 -0800 2008
commit  497cf18fcd67b546d318893a05de8e55fd2fb02e
tree    c444c221dcc8afec0b721f529fc0cd34053e1fec
parent  f831928bb570bc1b9c804c4dd5e6987112c4a90a 
Allow Merb.root_path to take a list of directories
dudleyf (author)
Tue Feb 12 09:15:26 -0800 2008
ezmobius (committer)
Tue Feb 12 18:04:26 -0800 2008
commit  f831928bb570bc1b9c804c4dd5e6987112c4a90a
tree    874925138004d084fa074a0dda29399841bef327
parent  d6afdf2cce03c26fca912de57e6d112aaf2dcfd2