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

05/02/08

Merge branch 'master' into wycats
michaelklishin (author)
Fri May 02 08:00:46 -0700 2008
commit  7f8f593329676577dd7588bb9dca9a889ae7b1d7
tree    06b7869465c76c30a9d3f939d3f34c8b9ab2fd6b
parent  7ea662050024e2e3b699f01f01f8aa8f480c94d5 parent  f7d2a4865d4123785bcabed2263e1dbb7ef14b17 
Added handling of INT signal for Merb server in foreground mode
brainopia (author)
Fri May 02 03:39:40 -0700 2008
michaelklishin (committer)
Fri May 02 07:58:26 -0700 2008
commit  f7d2a4865d4123785bcabed2263e1dbb7ef14b17
tree    f66ed638afece3db799288605cf050300ec2e77f
parent  fe4c67143ca11a325ef4717e2fc347b19f65034a 
Merge branch 'master' into wycats
michaelklishin (author)
Fri May 02 05:30:52 -0700 2008
commit  7ea662050024e2e3b699f01f01f8aa8f480c94d5
tree    64d3301e5b93a0555c7b435e32c256c45176d7fd
parent  69f16dca75c22ec5ac1f3aca088975118d8ede75 parent  fe4c67143ca11a325ef4717e2fc347b19f65034a 
Merge branch 'master' of git@github.com:wycats/merb-core into wycats
michaelklishin (author)
Fri May 02 05:30:24 -0700 2008
commit  69f16dca75c22ec5ac1f3aca088975118d8ede75
tree    bae3860ac92857d24bc672d0c810ad2c43fc32f5
parent  af6683546d77001ed9db685f023071c69cd81376 parent  4759a463e6ac96e6ddaf6bc9758d7a0c7fc092fb 
Remove redundant unescape for cookie string
kyledrake (author)
Fri May 02 00:53:45 -0700 2008
michaelklishin (committer)
Fri May 02 05:30:14 -0700 2008
commit  fe4c67143ca11a325ef4717e2fc347b19f65034a
tree    6098d81d708c4f3c46c8e4da8b92a176a39f6462
parent  4759a463e6ac96e6ddaf6bc9758d7a0c7fc092fb 
Ensure that Merb::Logger doesn't try to close terminal streams.
nex3 (author)
Thu Mar 27 00:23:22 -0700 2008
michaelklishin (committer)
Fri May 02 00:00:20 -0700 2008
commit  4759a463e6ac96e6ddaf6bc9758d7a0c7fc092fb
tree    9b3ee6b460c40084e4af20ed4fc4836b1f5b6da8
parent  2ee84cf1afdfaf533d5f524a900f3441517e89bb

05/01/08

Ensure that Merb::Logger doesn't try to close terminal streams.
nex3 (author)
Thu Mar 27 00:23:22 -0700 2008
michaelklishin (committer)
Thu May 01 23:58:34 -0700 2008
commit  af6683546d77001ed9db685f023071c69cd81376
tree    bae3860ac92857d24bc672d0c810ad2c43fc32f5
parent  7f2316c9f4194f18dfbaac8c9d631aa363df2bed 
Added support for multiple keys to designate a resource. For use with 
Datamapper composite keys support 
http://www.datamapper.org/articles/spotlight_on_cpk.html
giom (author)
Fri Apr 25 22:25:16 -0700 2008
michaelklishin (committer)
Thu May 01 23:50:37 -0700 2008
commit  7f2316c9f4194f18dfbaac8c9d631aa363df2bed
tree    b0af0f8ca820bfef45d50e84abbcfb0eeef63e3f
parent  2ee84cf1afdfaf533d5f524a900f3441517e89bb 
Make Provide controller matcher doc conform to Merb standards.
michaelklishin (author)
Thu May 01 23:38:11 -0700 2008
commit  2ee84cf1afdfaf533d5f524a900f3441517e89bb
tree    61a8f9e3e8116827460267679c73cfe0d4f804a4
parent  715b1200f0c92e6d6dd525694f235d1286f4414d 
Whoops. Had target and expected backwards.
wzph (author)
Sat Apr 19 16:03:46 -0700 2008
michaelklishin (committer)
Thu May 01 23:35:51 -0700 2008
commit  715b1200f0c92e6d6dd525694f235d1286f4414d
tree    bb6db2fe1ff606bf65df7620535cf3b8ba8b6cb3
parent  0c958e38d916a1f829306dc4aebf72d753a9f838 
Added Provide matcher class, so you can do "controller.should provide( 
:xml )" in your specs.
wzph (author)
Sat Apr 19 15:35:28 -0700 2008
michaelklishin (committer)
Thu May 01 23:33:04 -0700 2008
commit  0c958e38d916a1f829306dc4aebf72d753a9f838
tree    e65a96b029a7257d073ecc5e2fd8a33d39261dc0
parent  76a666372cdf1d59ac1699b289b981cef3475dab 
completed spec to Merb::Logger#new
James Whiteman (author)
Thu Apr 17 20:50:24 -0700 2008
michaelklishin (committer)
Thu May 01 23:20:22 -0700 2008
commit  76a666372cdf1d59ac1699b289b981cef3475dab
tree    eccc60659f1a7ed755851ce82a28fd7b88792f3f
parent  c432669d4d96bef8d0cef1b0f3abcbff3af1ac0d 
Adding missing info about ebb adapter.
hipertracker (author)
Wed Mar 26 04:45:06 -0700 2008
michaelklishin (committer)
Thu May 01 23:10:42 -0700 2008
commit  c432669d4d96bef8d0cef1b0f3abcbff3af1ac0d
tree    7f6905b452086303f34107f295a96e4a8eee246b
parent  b2867ec377b6beac376029044be779c75fb92201 
Show merb usage if first argument is not a switch
daikini (author)
Tue Mar 25 14:16:30 -0700 2008
michaelklishin (committer)
Thu May 01 22:57:14 -0700 2008
commit  b2867ec377b6beac376029044be779c75fb92201
tree    68d67fb3dac6411beaf4f539d791b5734b5b5610
parent  92dcf722b7e34f8562340b42ed9ada44201fea91 
Fix a spelling error and properly RDoc'ify a method name
jherdman (author)
Tue Mar 25 07:01:50 -0700 2008
michaelklishin (committer)
Thu May 01 22:48:28 -0700 2008
commit  92dcf722b7e34f8562340b42ed9ada44201fea91
tree    67e69491ab02bf98b34347df1c0609c48736f106
parent  63aac504c23418b4c63f9f35b241061a256f0feb 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Thu May 01 22:00:04 -0700 2008
commit  63aac504c23418b4c63f9f35b241061a256f0feb
tree    4bfca59f9b1a5205d4402748c9e334e15b7649f9
parent  de70389ab5989e1559da27e9b3cbb0bb7c5d2bcf parent  76d6300f01109a71750f08dde453efd357b9fe1b 
Fix bug in --very-flat (allow direct inheritance from Merb::Controller)
wycats (author)
Thu May 01 21:59:52 -0700 2008
commit  de70389ab5989e1559da27e9b3cbb0bb7c5d2bcf
tree    b00cfe68505b01e6ac98c206ef29902cc7cec2ae
parent  65dc024eb6551bec259c9b971fb1a083b999e298 
Merge branch 'master' into wycats
michaelklishin (author)
Thu May 01 21:43:01 -0700 2008
commit  76d6300f01109a71750f08dde453efd357b9fe1b
tree    4d757c6a9110c06e2eb611438c75499f7da13f35
parent  65dc024eb6551bec259c9b971fb1a083b999e298 parent  88b2c03b7c6c6fa5e9fa45403025c3f90eaac878 
Changed copyright date in footer of HTML pages from 2007 to 2008
bradly (author)
Tue Apr 01 22:15:38 -0700 2008
michaelklishin (committer)
Thu May 01 21:40:41 -0700 2008
commit  88b2c03b7c6c6fa5e9fa45403025c3f90eaac878
tree    362fb702eb59f8a766db45663e0af1c4a0c20659
parent  dd5e839945abb03ce3865d9dfe911e655424cb79 
Append the content_type to the given :template option for render()
fabien (author)
Thu May 01 14:54:49 -0700 2008
commit  65dc024eb6551bec259c9b971fb1a083b999e298
tree    5e7a8debdaf060ad5ddac55500bc32273dc5b288
parent  4047cd57f2ff7dfaf9ea0f88b7ff9744262fd071 
Merge branch 'master' of git@github.com:wycats/merb-core
fabien (author)
Thu May 01 14:47:44 -0700 2008
commit  4047cd57f2ff7dfaf9ea0f88b7ff9744262fd071
tree    a725b0fee5455f180d673dc5d84bcba01cc4676d
parent  045e153fb5e96c43f95f1fd3674787f862e202fe parent  dd5e839945abb03ce3865d9dfe911e655424cb79 
Merge branch 'wycats_master'
michaelklishin (author)
Thu May 01 10:11:43 -0700 2008
commit  dd5e839945abb03ce3865d9dfe911e655424cb79
tree    48b1d71e2a89a23fa50e72770b42336ecd900539
parent  cb08223191686cdaf359851053c6a48a92b19e82 parent  09d0d880ca3448932b9bcb4af5068301633e939c 
Replaced remaining ::STATUS constant references to .status method calls
fabien (author)
Thu May 01 02:15:12 -0700 2008
commit  045e153fb5e96c43f95f1fd3674787f862e202fe
tree    068055424b2bef7f6b1df6f57ca91ce6a4305d13
parent  637c35218664969861fe021aa68f11551d1481de 
Refactored Exception status handling/inheritance (it actually works now!)
fabien (author)
Thu May 01 02:11:58 -0700 2008
commit  637c35218664969861fe021aa68f11551d1481de
tree    84c9c610cf08b1fc3465061e6eb2073320a90e9a
parent  09d0d880ca3448932b9bcb4af5068301633e939c

04/30/08

Merge branch 'master' of git://github.com/somebee/merb-core into 
somebee/master
wycats (author)
Wed Apr 30 11:40:54 -0700 2008
commit  09d0d880ca3448932b9bcb4af5068301633e939c
tree    d85a1c0e3123683100bd6c038edfde2a744faff5
parent  079939dbe88d71d5d7bd4bf1c0e4db1c16ef4682 parent  cfda52e392341f17834c5e2bd3779bc506da5d25 
Merge branch 'gabriel/kill_fix'
wycats (author)
Wed Apr 30 11:38:42 -0700 2008
commit  079939dbe88d71d5d7bd4bf1c0e4db1c16ef4682
tree    be7ccf335bbe30946dd159912bde61ad8e11ecaf
parent  114fed66be9cd4eaa871e3972591f4d27a0811ac parent  de88e4c7907618f019a8e03f61f3a0fa0a0685a9 
Merge branch 'pidfile_fix' of git://github.com/gabriel/merb-core into 
gabriel/pidfile_fix
wycats (author)
Wed Apr 30 11:33:35 -0700 2008
commit  de88e4c7907618f019a8e03f61f3a0fa0a0685a9
tree    76b94448cd65e794e4993c230b1622a1fe5ace0c
parent  5a4589f5c174f3d5d979ece83476588f478e6cce parent  09329953cca03647cb92d0822a0a1e91ad7a90f6 
Make Inflector#plural and Inflector#singular conform to Merb doc standard.
michaelklishin (author)
Wed Apr 30 00:39:44 -0700 2008
commit  cb08223191686cdaf359851053c6a48a92b19e82
tree    edb2e43752acce6025eb437b88ee39d593153ab7
parent  114fed66be9cd4eaa871e3972591f4d27a0811ac

04/29/08

Update inflector documentation.
michaelklishin (author)
Tue Apr 29 22:52:01 -0700 2008
commit  114fed66be9cd4eaa871e3972591f4d27a0811ac
tree    42df985dd58b51ee1f3b187408af75727c8a3b22
parent  0d5899e7012fd934bb96fcaf5567a18c6d931597 
Tiny docs update to Merb::Server.
michaelklishin (author)
Tue Apr 29 22:12:33 -0700 2008
commit  0d5899e7012fd934bb96fcaf5567a18c6d931597
tree    ff9fa17e9c39978fcbe8dc6956cec1096d618d85
parent  caef0bf262a53072b6700a84b87a9e40f3a75e90