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

03/07/08

ix not-available vs. not-provided bug in content negotiation
ezmobius (author)
Fri Mar 07 18:17:47 -0800 2008
commit  03bb0c841a9ecab2ef58fc2b4baca31de56d97e0
tree    7faacd2ca0ec5ce1ab1dda9bbaa7afdad986b3a4
parent  b70fa60d8142c2696efea2b4d5c812ca926ab043 
Fixed display bug which caused default error exception pages to improperly 
display drop-down twirly if the path name exceeded the line length.
Oliver Jakubiec (author)
Fri Mar 07 12:55:34 -0800 2008
ezmobius (committer)
Fri Mar 07 18:05:08 -0800 2008
commit  b70fa60d8142c2696efea2b4d5c812ca926ab043
tree    ba2e4cc5c0de9d62b9a17a8d367bb0f01255eb97
parent  d58d7ed55ab2363c93c5e12c40a75f7e5e54f595

03/06/08

Merge branch 'master' of git@github.com:wycats/merb-core
ezmobius (author)
Thu Mar 06 22:11:16 -0800 2008
commit  d58d7ed55ab2363c93c5e12c40a75f7e5e54f595
tree    77dc13deed599c7a48850b36ebbe9e0a424018fb
parent  722e102c080132c4ff845e8c86bd50a8d3e73f1b parent  07ac55a19b2e382b8a355cd8425fd35ad3053676 
remove symbolize_keys! as we don't use it anywhere. by now..
ezmobius (author)
Thu Mar 06 22:10:41 -0800 2008
commit  722e102c080132c4ff845e8c86bd50a8d3e73f1b
tree    973654fa8300e3258666863d410dd62136ca22dd
parent  b8857ba7342d0daa2c316af9b555acf30abc4ccc 
Rework bootloader to make more sense for flat apps (specifically framework 
load)
wycats (author)
Thu Mar 06 18:58:23 -0800 2008
commit  07ac55a19b2e382b8a355cd8425fd35ad3053676
tree    57144544cda6c85f92980443f5fd8c82e5c5c7e5
parent  4bc62b7ff476a04526176e4fbaeebf3b5acdb5f8 
Removed commented line.
wycats (author)
Thu Mar 06 16:58:20 -0800 2008
commit  4bc62b7ff476a04526176e4fbaeebf3b5acdb5f8
tree    2a3cb77f7f1b08472404890e3fd4ec8d91929fe1
parent  842901cfe81c1b741946f85b6d4457f7a7471de9 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Thu Mar 06 15:21:10 -0800 2008
commit  842901cfe81c1b741946f85b6d4457f7a7471de9
tree    e8934bbaa4e0ac257a62125ce74d73df437f7e65
parent  4f3e25c2849118866225aede23e2bdce93fcc9f6 parent  b8857ba7342d0daa2c316af9b555acf30abc4ccc 
More fixes to the flat autoloader
wycats (author)
Thu Mar 06 15:20:38 -0800 2008
commit  4f3e25c2849118866225aede23e2bdce93fcc9f6
tree    eaf8b8bd1994ec5ac1103dffa851e48f03d73986
parent  be4a43b220792ca780b501bbd2607acd993325ae 
remove custom_* resource route, use :member or :collection instead
ezmobius (author)
Thu Mar 06 15:03:22 -0800 2008
commit  b8857ba7342d0daa2c316af9b555acf30abc4ccc
tree    c545a3aa1de5a056f5e4f63acb9fca87352cacaf
parent  c6c697028b92ec6e09f2a14f0e84959e85c22f68 
fix logger specs
ezmobius (author)
Thu Mar 06 14:16:06 -0800 2008
commit  c6c697028b92ec6e09f2a14f0e84959e85c22f68
tree    c6ae8d6215e84491a8024398447782a6874587d0
parent  4244234a06e53cf3f46dc8846e8d3548e4a1f7e4 
Merge branch 'master' of git@github.com:wycats/merb-core
ezmobius (author)
Thu Mar 06 14:13:23 -0800 2008
commit  4244234a06e53cf3f46dc8846e8d3548e4a1f7e4
tree    6fdee1e694480d2444bb4a50953993fb524a2e3a
parent  09e6bddbe25671dc6886c8650b10ba9456dd3722 parent  be4a43b220792ca780b501bbd2607acd993325ae 
Fixes bug with framework not being defined.
wycats (author)
Thu Mar 06 14:12:58 -0800 2008
commit  be4a43b220792ca780b501bbd2607acd993325ae
tree    70620d8453eea8b4d9f6b794d21995cab5fb3cb6
parent  cf2476614f352503ed4b631413c4abbec9c79183 
Merge branch 'master' of git@github.com:wycats/merb-core
ezmobius (author)
Thu Mar 06 14:12:35 -0800 2008
commit  09e6bddbe25671dc6886c8650b10ba9456dd3722
tree    9c883459b4882a3a997049dec54bb8dbcf90e8f0
parent  9b1501efc823221d492c7dffa66316c46bcc18dd parent  cf2476614f352503ed4b631413c4abbec9c79183 
make sure logger bang! methods do not flush unless the proper log level is 
used.
ezmobius (author)
Thu Mar 06 14:12:21 -0800 2008
commit  9b1501efc823221d492c7dffa66316c46bcc18dd
tree    0c86a7aa07190dd7401ccf72f045f33376b0eeee
parent  d4e533e96774982ff117c82bc209e1245be64a49 
Resolves conflict and merges.
wycats (author)
Thu Mar 06 14:09:26 -0800 2008
commit  cf2476614f352503ed4b631413c4abbec9c79183
tree    ff5b0b8c821e8ee6162cac2336b4934c233ae3ac
parent  e33cc3c7cc3ec182201716e5e38e5aacecfef9a0 parent  06b17f86085411ef7fc5232f2dbb8d3608b49e0d 
Framework sanity
wycats (author)
Thu Mar 06 14:06:14 -0800 2008
commit  e33cc3c7cc3ec182201716e5e38e5aacecfef9a0
tree    a7477899e64a9cd811b624614ed3d98515a87772
parent  a90df4f413db9c6377f776b32da67e3b83131880 
Updates the request spec to account for the new from_xml behaviour
hassox (author)
Thu Mar 06 05:08:26 -0800 2008
commit  06b17f86085411ef7fc5232f2dbb8d3608b49e0d
tree    d8092cc0546761b344145271415ae9b400d023f7
parent  2368f8f95e17f236ce50abdf77b83d7db587abd4 
Adds specs and changes for compatibility with ActiveSupport.  There is one 
caveat.  It will not change YAML generated Hash keys to strings if they 
are defined as symbols as is currently the behaviour of ActiveSupport.
hassox (author)
Thu Mar 06 05:03:45 -0800 2008
commit  2368f8f95e17f236ce50abdf77b83d7db587abd4
tree    424ab87f320a0374bf0ae141c112056992cb7bf3
parent  d4e533e96774982ff117c82bc209e1245be64a49 
update the logger. no longer accept an optional block to call.
ezmobius (author)
Thu Mar 06 00:04:49 -0800 2008
commit  d4e533e96774982ff117c82bc209e1245be64a49
tree    5891218bee97d71d9e81f40d0cc30ad02281350a
parent  a90df4f413db9c6377f776b32da67e3b83131880

03/05/08

remove some vestigal config defaults
ezmobius (author)
Wed Mar 05 15:52:01 -0800 2008
commit  a90df4f413db9c6377f776b32da67e3b83131880
tree    397f45b31660474fb54a004388ec9d825daab84d
parent  dd1894e76d4253bbe4faa2fb1201c6bed2498f05 
Add rack adapter for Ebb, damn it's fast!
ezmobius (author)
Wed Mar 05 15:51:48 -0800 2008
commit  dd1894e76d4253bbe4faa2fb1201c6bed2498f05
tree    4791bdffe69b08a28dc8756e7966a8392548e2f4
parent  989cafc63e337fcb5fae2441d8c14cfaa8a46a0e 
coerce the port to an integer when starting mongrel (jruby compat)
ezmobius (author)
Wed Mar 05 14:45:51 -0800 2008
commit  989cafc63e337fcb5fae2441d8c14cfaa8a46a0e
tree    17fa13c37d5c6c934f17c223dfe66d406eb5a69f
parent  2c48aa531e472c47834290970ea83349b8f233bc 
remove specs for dependency as they were broittle and not testing the 
right thing.
ezmobius (author)
Wed Mar 05 12:59:55 -0800 2008
commit  2c48aa531e472c47834290970ea83349b8f233bc
tree    fd2dce3cfc9e2b41a1b41995a5e346975b2c9dd2
parent  89b6937ccc43070ee5c050474361c63453aa9d46 
Missing documentation
Janne Asmala (author)
Tue Mar 04 21:30:23 -0800 2008
wycats (committer)
Wed Mar 05 12:55:22 -0800 2008
commit  89b6937ccc43070ee5c050474361c63453aa9d46
tree    6a604c2af09eb1f7cc33da85839210eab4ff2dc1
parent  58bd96a49004025e7afa23d2caa9fedf3ad58f39 
Fixes #155 (_perform_content_negotiation doesn't find */* if it comes last 
in the accept header order, and nothing else matches)
wycats (author)
Wed Mar 05 12:52:55 -0800 2008
commit  58bd96a49004025e7afa23d2caa9fedf3ad58f39
tree    9df88f251cbe17caff9239ab7d181419ac2c171c
parent  1631105b30808f449cf486bf71cbfff6536148a3 
Changes use_test to wrap only the call to dependencies in the check for 
Merb.environment == "test"
hassox (author)
Wed Mar 05 02:03:14 -0800 2008
commit  1631105b30808f449cf486bf71cbfff6536148a3
tree    a646538e03239542d78bcc496ccba3f8ec152a3a
parent  d06148fec38a07aa50ac09e7ec12f71ca0f7f2e8

03/04/08

update changelog
ezmobius (author)
Tue Mar 04 22:25:17 -0800 2008
commit  d06148fec38a07aa50ac09e7ec12f71ca0f7f2e8
tree    47796f22f4e4f125a0b5683b46092472b45a4388
parent  384685cc991b912aa369c95f0345294c3c1ac510 
change dependency() to use gem() instead of Gem.activate
ivey (author)
Tue Mar 04 21:46:12 -0800 2008
commit  384685cc991b912aa369c95f0345294c3c1ac510
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