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

03/19/08

Added html_escape around the exception.message in the show details 
section.
Flea (author)
Wed Mar 12 07:22:37 -0700 2008
ezmobius (committer)
Wed Mar 19 12:22:25 -0700 2008
commit  e3a72791eaee77fe360b39a599e3eeaf4dcfcec6
tree    3b0952cf703786f380107cc85e659c4a2b199d4f
parent  130ee1ee30e08e23cd4563bce954ecacff88a5b3 
Fixed bug not allowing have_tag to be called without a attribute hash, 
even when one is not desired
raycmorgan (author)
Sat Mar 15 21:23:26 -0700 2008
ezmobius (committer)
Wed Mar 19 12:20:49 -0700 2008
commit  130ee1ee30e08e23cd4563bce954ecacff88a5b3
tree    3040cdac5906c6a4c6c493a49d6e8a59bc6201ba
parent  ce659ee9d210df80d177d686c836a20d5585c00b 
fix typo
ezmobius (author)
Wed Mar 19 12:19:29 -0700 2008
commit  ce659ee9d210df80d177d686c836a20d5585c00b
tree    3fe5c4f71bb0fbb475abdfb2f89ef77b2ff39a44
parent  18eb76a2a28db4acfd1637d37793f0580146fb02 
refactor and clean up Merb::BootLoader::Dependencies [James Herdman]
ezmobius (author)
Wed Mar 19 12:16:54 -0700 2008
commit  18eb76a2a28db4acfd1637d37793f0580146fb02
tree    161ceb66fe1fc81fa7799fdc001e5a521084aa70
parent  85b0471e96a7d287401af5c962253d79666de779 
ticket 202
ezmobius (author)
Wed Mar 19 12:09:16 -0700 2008
commit  85b0471e96a7d287401af5c962253d79666de779
tree    ee31cdf698f7a0e866139d2d6e7c9529744e682e
parent  aea93e8b0c4c492e8437cf3cd5c49eb2c5ccb39f 
This keeps erroring out, i hope it didnt commit multiple times:
Cory ODaniel (author)
Tue Mar 11 12:40:02 -0700 2008
ezmobius (committer)
Wed Mar 19 12:07:16 -0700 2008
commit  aea93e8b0c4c492e8437cf3cd5c49eb2c5ccb39f
tree    e957d8ced37e28753bfbd456f93d8a5aa91efc3a
parent  bcc5121cedaee28b519ccb01accc08f59c3ef236

03/17/08

Merb::BootLoader::LoadClasses should keep unique list of classes
fabien (author)
Mon Mar 17 13:31:05 -0700 2008
commit  bcc5121cedaee28b519ccb01accc08f59c3ef236
tree    d0079e7cd9f340c48ee0c757846cfb6bebe56a80
parent  589c989a4d322575b0dce86ec42000fc4e8d7c60

03/14/08

Logger now works as expected, fixed ReloadClasses bootloader
fabien (author)
Fri Mar 14 02:46:51 -0700 2008
commit  589c989a4d322575b0dce86ec42000fc4e8d7c60
tree    d7f286c483bb0c995252f0311e1020d8f8216b14
parent  bd6814e14a9da3c161e1f6b14b71f88b5a9f0748

03/13/08

Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Thu Mar 13 16:15:59 -0700 2008
commit  bd6814e14a9da3c161e1f6b14b71f88b5a9f0748
tree    fcbf85f21b53267c559fea7f94efcfbef9dd72f5
parent  fee90e18ff98e282eb84452216401bbca922f956 parent  c25e77fc8ededd692306415be837df971a7d72c2 
Fixes cookie sessions when the session is blanked out.
wycats (author)
Thu Mar 13 16:15:25 -0700 2008
commit  fee90e18ff98e282eb84452216401bbca922f956
tree    897f17f4a3db38934275c6f3b78b6a6474391558
parent  adad648d6c700c7ff450ae7a6f1abf3ca136264a

03/12/08

catch_content should default to :for_layout
ivey (author)
Wed Mar 12 22:08:52 -0700 2008
commit  c25e77fc8ededd692306415be837df971a7d72c2
tree    406408570014c24c6a69afa8f00dc2f641368f8f
parent  0a15099a76e50b6d3419a81c2acdb6b9214e0a71 
Added --sandbox (-S) option for IRB console
fabien (author)
Wed Mar 12 13:28:08 -0700 2008
commit  0a15099a76e50b6d3419a81c2acdb6b9214e0a71
tree    1c1a87d1fcec5b1ebcf56effd2eec4e095730b1c
parent  adad648d6c700c7ff450ae7a6f1abf3ca136264a

03/11/08

Added Merb.testing? method
fabien (author)
Tue Mar 11 01:47:18 -0700 2008
commit  adad648d6c700c7ff450ae7a6f1abf3ca136264a
tree    eec2ffb356aa16fccbf48adfb3169b516ed4e358
parent  209ab5ce04f2b2b2579a12228139653af5049616 parent  ea57d20b0d1abd7cf2511d37f9b6cd17a2cda371 
Fixes the dispatch_to request helper to conver the action name to a 
string.
hassox (author)
Tue Mar 11 05:58:37 -0700 2008
commit  ea57d20b0d1abd7cf2511d37f9b6cd17a2cda371
tree    51966d7024e13bee1b9bcd38a1ed273513582dc0
parent  ff17f772b2bd30f8d57c9aa6920d4b0e83dd1d48 
Added Merb.testing? method
fabien (author)
Tue Mar 11 01:47:18 -0700 2008
commit  209ab5ce04f2b2b2579a12228139653af5049616
tree    5808a4b8ce659b0e877393cdd972b09af6fc3d11
parent  ff17f772b2bd30f8d57c9aa6920d4b0e83dd1d48

03/10/08

Fixed critical bug in LoadClasses BootLoader concerning reloading
fabien (author)
Mon Mar 10 12:10:46 -0700 2008
commit  ff17f772b2bd30f8d57c9aa6920d4b0e83dd1d48
tree    f20ac7b4b5bda24265f0aea95d869b6412e0dc3b
parent  2f1555c55cd6957a1fc245a1daf079de7cb7c1dc 
Important changes to the BootLoader process
fabien (author)
Mon Mar 10 12:09:56 -0700 2008
commit  2f1555c55cd6957a1fc245a1daf079de7cb7c1dc
tree    0e516fec559c95eda1e18685537ed387a5b1fe2b
parent  e6303b6c9a656156acdb516ebb08614af102a25f 
Added Kernel.load_dependencies method; better docs/comments.
fabien (author)
Mon Mar 10 12:09:04 -0700 2008
commit  e6303b6c9a656156acdb516ebb08614af102a25f
tree    3824fc8e3c29aef7e3fafe785205b1ea6b815b50
parent  d6d39a18d52df939ca5efd67e7fa56174aeaeb70 
Bugfixes concerning BootLoader and load order in general
fabien (author)
Mon Mar 10 12:08:11 -0700 2008
commit  d6d39a18d52df939ca5efd67e7fa56174aeaeb70
tree    a913b4ad1d135eef63e1dbaae250e426f88d000b
parent  d735ddfb4eeb4647915cdcfc548ca5c418f5ad64

03/09/08

fully qualify fcgi rack handler
ezmobius (author)
Sun Mar 09 23:12:16 -0700 2008
commit  d735ddfb4eeb4647915cdcfc548ca5c418f5ad64
tree    14ae0d2eeed8604b7e307a2750237fa1d62e4dd0
parent  531253f3483dadd0124a435fd7c0c948b7173e89 
Fix configuring session_id_key so that it works
daikini (author)
Sun Mar 09 13:52:07 -0700 2008
ivey (committer)
Sun Mar 09 20:58:39 -0700 2008
commit  e6fc6a076a8b1b8668304c8fbc91fd8b4128269d
tree    763f7d17e552220b59d7156d3f68352bb12eef8b
parent  01b85241150e557106a73dae0500eebd1a2a9a46 
url(:foo, 3) should notice 3 is a Fixnum, and use it instead of 3.id
daikini (author)
Sun Mar 09 15:40:48 -0700 2008
ivey (committer)
Sun Mar 09 20:55:40 -0700 2008
commit  01b85241150e557106a73dae0500eebd1a2a9a46
tree    edfd9c599896020ff041a814e79955b44a601c7f
parent  1b663b88e39615ac0c08f0041fff8b33b0adbd20

03/08/08

make load order of core_ext explicit
ezmobius (author)
Sat Mar 08 15:54:38 -0800 2008
commit  1b663b88e39615ac0c08f0041fff8b33b0adbd20
tree    81f3dffbb7ff8f7c3320998a428a734d4cee7920
parent  d5a8a00485180484100ae56b34c8f69eaeb48943 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Sat Mar 08 13:18:16 -0800 2008
commit  d5a8a00485180484100ae56b34c8f69eaeb48943
tree    c7437a388acbae043c6c4b4d60f1ce9232173068
parent  197f64a350be53d8e4f39e9cdf5ac3489d5e3f9e parent  03bb0c841a9ecab2ef58fc2b4baca31de56d97e0 
Modifies before/after in BootLoader to actually work.
wycats (author)
Sat Mar 08 13:17:55 -0800 2008
commit  197f64a350be53d8e4f39e9cdf5ac3489d5e3f9e
tree    c044993454b3e770fe325b2fb9787d42189b5129
parent  d58d7ed55ab2363c93c5e12c40a75f7e5e54f595

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 
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 
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 
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

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 
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 
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

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 
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/01/08

Touching up a few things
ezmobius (author)
Sat Mar 01 19:22:28 -0800 2008
commit  ee58c6c141d422f8bc7a7d596fa89071b0c63f8f
tree    41a5549cc4aa34f0718ff6600e5f02ecbb5a64a6
parent  5cfe8ec4d6cf636fb9a11318110a7f7e49cf4a98 
Merge branch 'master' of git@github.com:wycats/merb-core
wycats (author)
Sat Mar 01 13:51:23 -0800 2008
commit  5cfe8ec4d6cf636fb9a11318110a7f7e49cf4a98
tree    8e3091778e3fe5c7c562042582f9e43ed90f595c
parent  1cf3ce72950beb0c3e439eae6d4123085607eaac parent  81f158b07996d9d7522956abdee8fd78bec6e8b2 
Creates helper stub modules for controllers.
wycats (author)
Sat Mar 01 13:51:02 -0800 2008
commit  1cf3ce72950beb0c3e439eae6d4123085607eaac
tree    32da27701fb8cd1c5b68433eb6469eedfdd823f2
parent  b4d85b39a0412d96d514275b26513db8936f4967

02/29/08

Prep core for 0.9.1 release
ivey (author)
Fri Feb 29 19:54:54 -0800 2008
commit  81f158b07996d9d7522956abdee8fd78bec6e8b2
tree    0e1b2f054674918620ddd0e75a2eefc72370c045
parent  b4d85b39a0412d96d514275b26513db8936f4967 
Should fix blank path.
wycats (author)
Fri Feb 29 20:14:02 -0800 2008
commit  b4d85b39a0412d96d514275b26513db8936f4967
tree    5907ee6cb6ef69bdb8ff22eab80822485f3d9fed
parent  ccadba5fba167f309af1828ffa0805816c84a65e 
Cooler errors
wycats (author)
Fri Feb 29 20:01:07 -0800 2008
commit  ccadba5fba167f309af1828ffa0805816c84a65e
tree    ebea46231c4ae8edbd13901c3cf0566b3b77ec86
parent  3365c3e9932894b53f1ec073ba7678bf209b1202 
add named routes to error page
ezmobius (author)
Fri Feb 29 18:15:10 -0800 2008
commit  3365c3e9932894b53f1ec073ba7678bf209b1202
tree    d4bb58301476160c98f2a4ff4e11650443df65ef
parent  dd6d8d1206be832567190ec8c843ce7b4b89d5f9 
update to nested resources fix
shayarnett (author)
Fri Feb 29 14:25:01 -0800 2008
ivey (committer)
Fri Feb 29 14:29:27 -0800 2008
commit  dfc3ab147788c37eb606143dd02b7af857c40c60
tree    81b330c40db3a34f5b5c60c7bda62d217eda50cd
parent  af2ef094e2582bc37e1606040f9b7108088f1058 
Merge branch 'rspec' of git://github.com/benburkert/merb-core
wycats (author)
Fri Feb 29 13:05:58 -0800 2008
commit  af2ef094e2582bc37e1606040f9b7108088f1058
tree    8589877ca08428721e3436c2e0178e9513a42f24
parent  f66745664c774ed84b9a3a7740290dbf6ef338d5 parent  c233e7fc252ba5a7850702bf7f014487885cd40c 
nested resources changes
shayarnett (author)
Fri Feb 29 08:24:33 -0800 2008
wycats (committer)
Fri Feb 29 12:53:30 -0800 2008
commit  f66745664c774ed84b9a3a7740290dbf6ef338d5
tree    63d0df39cde1ad168fa7bc40454fb6cf9cce2d61
parent  0b7f94a35d25057b7cccd593cea3abaae3efa72a 
get autotest working for merb-core