cardmagic / 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/cardmagic/merb-core.git
merb-core / Commit History feed

03/04/08

change dependency() to use gem() instead of Gem.activate
ivey (author)
Tue Mar 04 21:46:12 -0800 2008
commit  f676a6d39fd3bd0d7bc171d07840f6ba659e4a69
tree    857864f3df22c4a1c9086067563ef42d205fed51
parent  0fc1a185a418061c06597f032f9a5e551719c1a4 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Tue Mar 04 18:27:53 -0800 2008
commit  0fc1a185a418061c06597f032f9a5e551719c1a4
tree    74e85ec6a354d0d5a091b6b86be81f3649b12440
parent  e442ea7787b119a127633ad9c28d57ee2a32505f parent  f891d8dbec205bc81eb1bf733f9079025b03a362 
As a last resort, look for */* in the formats before throwing 
NotAcceptable (TODO: Clean this up)
wycats (author)
Tue Mar 04 17:13:57 -0800 2008
commit  e442ea7787b119a127633ad9c28d57ee2a32505f
tree    4e8255ebaebb9bd16fac737426dc7703e68430ea
parent  826d11734cd188ed0c4ff32507a5c4a79a259689 
really remove hooks
ezmobius (author)
Tue Mar 04 16:53:04 -0800 2008
commit  f891d8dbec205bc81eb1bf733f9079025b03a362
tree    8095810afd665f7400e00c29c5595de6bf2f86d2
parent  8c27e9c3d588ffb19f571539711fcc375db99c43 
don't require hook.rb
ezmobius (author)
Tue Mar 04 16:50:13 -0800 2008
commit  8c27e9c3d588ffb19f571539711fcc375db99c43
tree    88d24cf869c608a24799afc1863a35ccc309e462
parent  826d11734cd188ed0c4ff32507a5c4a79a259689 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Tue Mar 04 15:53:56 -0800 2008
commit  826d11734cd188ed0c4ff32507a5c4a79a259689
tree    bd484a14f9cb51c1c5272c3e1d4729954ec9dfbe
parent  315e3c81828d33694d3ef279060dbac09a56aadc parent  0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081 
Fix perform_content_negotiation to correctly handle :format in params. Fix 
render_* to correctly return the correct content_type.
wycats (author)
Tue Mar 04 15:53:03 -0800 2008
commit  315e3c81828d33694d3ef279060dbac09a56aadc
tree    7926e9b8928d9d66aba5a5c685ff3663d418e677
parent  4faa93bc6561fa9366dcb97e89775a08d29c086d 
remove hooks.rb, they were premature and only used in one place
ezmobius (author)
Tue Mar 04 15:04:24 -0800 2008
commit  0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081
tree    b22fa46ec7cd1d376ca8cec74dd3b11e9fece27b
parent  fad650f492effd0393d8c6ed393e834ce9160bd7 
Merge branch 'master' of git@github.com:wycats/merb-core
ezmobius (author)
Tue Mar 04 13:34:12 -0800 2008
commit  fad650f492effd0393d8c6ed393e834ce9160bd7
tree    66830f510645a66d18adebbcfd69ec92274425af
parent  17fa804630498330f69f46765c4ef6a4f4eb405a parent  4faa93bc6561fa9366dcb97e89775a08d29c086d 
fix evented mongrel to not go crazy
ezmobius (author)
Tue Mar 04 13:33:51 -0800 2008
commit  17fa804630498330f69f46765c4ef6a4f4eb405a
tree    61e05b8f14e95b14bd2866b4df35e9268960ae24
parent  bf38f7948cdcb9a05a1177604d80b87558777987 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Tue Mar 04 13:30:04 -0800 2008
commit  4faa93bc6561fa9366dcb97e89775a08d29c086d
tree    4827bfa468245954d5ac2d9c8b1c5480c3fc5600
parent  7a1c3e23354621f680554ee0bd3e873dff4b22c7 parent  bf38f7948cdcb9a05a1177604d80b87558777987 
Calling /foo.pdf should throw a 406 if :pdf is not a registered mime.
wycats (author)
Tue Mar 04 13:28:50 -0800 2008
commit  7a1c3e23354621f680554ee0bd3e873dff4b22c7
tree    f75b8540acc02b6bc86dce9f6549c258e056b368
parent  539dd037b1845e13c11203ce10986898c52b4fd3 
touch up dispatcher a bit, remove some un-needed code from the hot path
ezmobius (author)
Tue Mar 04 13:14:47 -0800 2008
commit  bf38f7948cdcb9a05a1177604d80b87558777987
tree    ef98abc73a26ebb068bbb8074e1869224cd49d5a
parent  66e0e524e72106234051371b859912befff7f670 
fix dispatcher to not parse the params twice, still supports 
request_params
ezmobius (author)
Tue Mar 04 13:01:38 -0800 2008
commit  66e0e524e72106234051371b859912befff7f670
tree    812b41a7e76a0bf160de576d04c38d4e70af2414
parent  31634b395abd6d690ebbb98a113e7e70aaf64ffd 
Should resolve #180 (Exception in exception.html.erb)
wycats (author)
Tue Mar 04 12:47:54 -0800 2008
commit  539dd037b1845e13c11203ce10986898c52b4fd3
tree    b784a8d1696ec23519390eaeff8c362ff90613af
parent  44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 
fix some specs to not rebuild the router every iteration
ezmobius (author)
Tue Mar 04 12:36:35 -0800 2008
commit  31634b395abd6d690ebbb98a113e7e70aaf64ffd
tree    7d61be6bff743026cc56f7da0988c0637ccfe885
parent  adc9ccd6d1636562a15a9662ae49fd97f4524a81 
Test documentation
Janne Asmala (author)
Sat Mar 01 20:36:15 -0800 2008
ezmobius (committer)
Tue Mar 04 12:31:09 -0800 2008
commit  adc9ccd6d1636562a15a9662ae49fd97f4524a81
tree    132ce836b4f5834389ef17f0d0f5787c0866d9a5
parent  44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 
Resolves #181 (Special chars in static filenames)
wycats (author)
Tue Mar 04 12:29:56 -0800 2008
commit  44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3
tree    326bc4957c200e0bc8dca401d833990860e4d7be
parent  6793ef9897e5ee6c11f0d29b743dbc9989fa722c

03/03/08

Install gem with --local so it won't poll remote servers for updates 
during install
lsegal (author)
Mon Mar 03 20:00:18 -0800 2008
commit  6793ef9897e5ee6c11f0d29b743dbc9989fa722c
tree    5db13f555e13fdff3c7d0da6b613261f3b6a6b93
parent  f23889f34b791e7e2c0c1ec14be47f7577999d20 
cleaned up a confusing if statement
benburkert (author)
Mon Mar 03 16:10:37 -0800 2008
commit  f23889f34b791e7e2c0c1ec14be47f7577999d20
tree    a6dee5e37980106cfec2706fc1ab40d762b1a0d3
parent  6a54e6c391aa01a9223d2b85772c539fa078214b 
moved rspec rake tasks into core.  Added Merb.rakefiles, which is now used 
by Merb::Plugins.rakefiles.  Changed Kernel#use_test to only load 
dependency arguments when Merb.env is nil or test.
benburkert (author)
Mon Mar 03 16:03:11 -0800 2008
commit  6a54e6c391aa01a9223d2b85772c539fa078214b
tree    b09899c164266d93cbc809c7ea882a519ac3ebf1
parent  758a19603ad276a6e95cbaed00bd6b9b4182f0eb 
do not load test framework unless Merb.env == 'test'
ezmobius (author)
Mon Mar 03 15:23:07 -0800 2008
commit  758a19603ad276a6e95cbaed00bd6b9b4182f0eb
tree    cb8c87614cc74668b7d100af29a0165ded7d51ce
parent  451c7857437a4084c00e5057fb6efd2092290342 
Use new Object.make_module to create the module instead of old hackish 
solution.
wycats (author)
Mon Mar 03 15:08:28 -0800 2008
commit  451c7857437a4084c00e5057fb6efd2092290342
tree    560a65df31c2ab6741db2c8f8a20052a96eae372
parent  9cd5ae93ea7ffe886edb959162e3b45b23885fec 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Mon Mar 03 14:02:52 -0800 2008
commit  9cd5ae93ea7ffe886edb959162e3b45b23885fec
tree    8b8c1a06b5cb943f3a7f2e70bcbfe65b8cc1a138
parent  ef0480aec9e5828387480b8f196956e6e6f844b5 parent  7e37e6779f3c64111ec7639f5aaf9095da3a8939 
Don't clear our mimes previously defined.
wycats (author)
Mon Mar 03 14:02:31 -0800 2008
commit  ef0480aec9e5828387480b8f196956e6e6f844b5
tree    6c5a6541245f15ac5a677097a686a4980eec5455
parent  ace2bd2aa023b16abc70a83333ffff5e46c65908 
Fixed clean task deleting everything in the lib folder
benburkert (author)
Mon Mar 03 13:40:15 -0800 2008
commit  7e37e6779f3c64111ec7639f5aaf9095da3a8939
tree    cf4f18dcc07b9b0e65119218306343ce51558760
parent  0ebd60030f2d8d5e4f50c0bf534172aaacc5c937 
Kernel#dependency requires gems/files in a before_app_loads block.
benburkert (author)
Mon Mar 03 12:48:51 -0800 2008
commit  0ebd60030f2d8d5e4f50c0bf534172aaacc5c937
tree    9cb7ca47af9329db802db498a54c17713ba9e3a7
parent  ace2bd2aa023b16abc70a83333ffff5e46c65908 
Move dependency loading after framework and look for framework.rb
wycats (author)
Mon Mar 03 12:27:10 -0800 2008
commit  ace2bd2aa023b16abc70a83333ffff5e46c65908
tree    aa9ba306cbf8b9c83124f8afb7194877d8561d90
parent  9585b19c5b49b02d05a44db457bcbf1f64a28a36

03/02/08

remove vestigal rbx dir
ezmobius (author)
Sun Mar 02 21:04:09 -0800 2008
commit  9585b19c5b49b02d05a44db457bcbf1f64a28a36
tree    76aacf41ec432fda82a40f15d4fa4874a1c6c81f
parent  ee58c6c141d422f8bc7a7d596fa89071b0c63f8f

03/01/08

Touching up a few things
ezmobius (author)
Sat Mar 01 19:22:28 -0800 2008
commit  ee58c6c141d422f8bc7a7d596fa89071b0c63f8f
tree    41a5549cc4aa34f0718ff6600e5f02ecbb5a64a6
parent  5cfe8ec4d6cf636fb9a11318110a7f7e49cf4a98