[e6514c3eca1cb20161367106c9a66f11a816a09a] Changeset [e6514c3eca1cb20161367106c9a66f11a816a09a] by Yehuda Katz

Make this debugging message only on in verbose mode http://github.com/wycats/merb/co...

Committed by Yehuda Katz

[12fb02ca399dc5f615b90b5383ae06d18e3e44c6] Changeset [12fb02ca399dc5f615b90b5383ae06d18e3e44c6] by Yehuda Katz

Don't display trace options in production mode [#1088 state:resolved] http://github.com/wycats/merb/co...

Committed by Yehuda Katz

[698fa5015e15a05a3bbfc69eb2f838b27ef7bfec] Changeset [698fa5015e15a05a3bbfc69eb2f838b27ef7bfec] by Yehuda Katz

Don't display trace options in production mode [#1088 state:resolved] http://github.com/wycats/merb/co...

Committed by Yehuda Katz

[31a22e715a44f3f10b98b0d26f4099a1f0f48a39] Changeset [31a22e715a44f3f10b98b0d26f4099a1f0f48a39] by Yehuda Katz

Make this debugging message only on in verbose mode http://github.com/wycats/merb/co...

Committed by Yehuda Katz

[5078b8bf11f23b1f4e42c701438c37c6140fd93e] Changeset [5078b8bf11f23b1f4e42c701438c37c6140fd93e] by David James

Fixed warning about STATUS_CODES due to 2 requires.

Signed-off-by: Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-co...

Committed by David James

[c122ec92e2defdddb6ed1fc6b317990696f74b45] Changeset [c122ec92e2defdddb6ed1fc6b317990696f74b45] by Michael S. Klishin

Use pointers to frozen strings instead of creating new objects on every request (does not make sense everywhere though). http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf] Changeset [72f7c7ef3a2ce6a0a0f409b2092e64da7d0795cf] by Carl Lerche

Added Merb::Router.extensions as an official API.

Merb::Router.extensions is now the official way to add functionality to the router. http://github.com/wycats/merb-co...

Committed by Carl Lerche

[209ca502a6e44f3115042f90b90caec6f82580ed] Changeset [209ca502a6e44f3115042f90b90caec6f82580ed] by Michael S. Klishin

Fixes a minor problem with has_tag/with_tag. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[3c1d2dcfc2fd64957ff0f9b65ca11bb8b52d11fd] Changeset [3c1d2dcfc2fd64957ff0f9b65ca11bb8b52d11fd] by Carl Lerche

Adding the ability to set conditions on resource keys

When defining resource routes, conditions for the keys can now be set by simply passing those conditions along as extra keys of the options hash.

For example:

Merb::Router.prepare do resources :users, :id => /[a-z]+/ end

This will also work with Array keys, such as.

Merb::Router.prepare do resources :users, :keys => [:name, :age],

:name => /[a-z]+/, :age => /\d+/

end http://github.com/wycats/merb-co...

Committed by Carl Lerche

[e3ec4814766fc1dfbbdbf2f1b7bff1f13b08ecc8] Changeset [e3ec4814766fc1dfbbdbf2f1b7bff1f13b08ecc8] by Fabien Franzen

Fixed empty Gem::Dependency requirement issue http://github.com/wycats/merb-co...

Committed by Fabien Franzen

[11d19c269a029403039b16866aaa8d6bb1a366ff] Changeset [11d19c269a029403039b16866aaa8d6bb1a366ff] by Michael S. Klishin

Use frozen constants on the 'hot path' if possible. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[ee43bd5f870bb9ad822bdade58cd970fc088b975] Changeset [ee43bd5f870bb9ad822bdade58cd970fc088b975] by Michael S. Klishin

Resolved conflict, added a note on metaprogramming use in -core. Sometimes it is appropriate. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[36c7538548f8b511c23a8e75600217edc9fd039b] Changeset [36c7538548f8b511c23a8e75600217edc9fd039b] by Michael S. Klishin

Correct documentation of session_expiry option. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[afa48c563f5faf06227e1b6b1b73f7638cfe960c] Changeset [afa48c563f5faf06227e1b6b1b73f7638cfe960c] by Michael S. Klishin

Use frozen constants on the hot path where possible. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[173c4a1889afe4fa355cd768b0c8c66ebbe987f6] Changeset [173c4a1889afe4fa355cd768b0c8c66ebbe987f6] by Michael S. Klishin

Fixes 2 syntax errors in specs. Forking runner swallowed those. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[d4739e7620f2f553578009c859de2dae4863c8a4] Changeset [d4739e7620f2f553578009c859de2dae4863c8a4] by Michael Holub

fixed specs for viewmatchers

Signed-off-by: Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-co...

Committed by Michael Holub

[ef6092a6ee79d112eccbea1b8862c21d46d51b99] Changeset [ef6092a6ee79d112eccbea1b8862c21d46d51b99] by Michael Holub

Add warning when loading rexml instead of libxml-ruby

Signed-off-by: Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-co...

Committed by Michael Holub

[1f6de2c3a0ec4bf42b4d6883e3898c2cc395f118] Changeset [1f6de2c3a0ec4bf42b4d6883e3898c2cc395f118] by Michael Holub

#329 bug fix

Signed-off-by: Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-co...

Committed by Michael Holub

[42da35e9861d0ca0ef228a017316a31d76cf0e29] Changeset [42da35e9861d0ca0ef228a017316a31d76cf0e29] by Michael S. Klishin

Log syntax errors when loading the app. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[3ae019fe96ffaa6cdaa79181279a1f8ef192eb69] Changeset [3ae019fe96ffaa6cdaa79181279a1f8ef192eb69] by Michael S. Klishin

Since intention/option comment behind workers respawn in -k are not clear, do not let killing master with -k for now. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[20fd63f05d75d10f8a6afc54c2295da259d89f78] Changeset [20fd63f05d75d10f8a6afc54c2295da259d89f78] by Michael S. Klishin

(put my Frankenstein voice on) It's alive! http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[2d721c48372e8aaf85b5b6c4b653b83df0402915] Changeset [2d721c48372e8aaf85b5b6c4b653b83df0402915] by Michael S. Klishin

Merge upstream, re-apply stash. http://github.com/wycats/merb-co...

Committed by Michael S. Klishin

[a68e147e759021d2e6ab1bd0e2d89fe4d9b1c2a1] Changeset [a68e147e759021d2e6ab1bd0e2d89fe4d9b1c2a1] by Michael S. Klishin

Merge branch 'sprint'

Committed by Michael S. Klishin

[dad0d934c0294e082d7dc525e61ed547daf4bf64] Changeset [dad0d934c0294e082d7dc525e61ed547daf4bf64] by Fabien Franzen

Committed by Fabien Franzen

[94e9ff04eb037495ade4d7bd10dd4e3bb540e637] Changeset [94e9ff04eb037495ade4d7bd10dd4e3bb540e637] by Yehuda Katz

Committed by Yehuda Katz

[a7fb18c7f3cf24321ccd8a8e03f6ddafcb6be651] Changeset [a7fb18c7f3cf24321ccd8a8e03f6ddafcb6be651] by Yehuda Katz

Merge commit 'adelcambre/sprint' into sprint http://github.com/wycats/merb-co...

Committed by Yehuda Katz

[d425060afd09ba313ae5fba3568029106009abf8] Changeset [d425060afd09ba313ae5fba3568029106009abf8] by Andy Delcambre

remove the route method from specs http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[d4917e085ab21bd15ec1960745f0e5e3449a16aa] Changeset [d4917e085ab21bd15ec1960745f0e5e3449a16aa] by Andy Delcambre

Committed by Andy Delcambre

[c9054d2c03f5daacce44aaedf225e23c9c1ee48f] Changeset [c9054d2c03f5daacce44aaedf225e23c9c1ee48f] by Andy Delcambre

Revert "Move most merb logger code out, into extlib"

This reverts commit 7a73c146dd28f4456b7ef2d1819834c67e04fa2a. http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[cc0e6ddec4437027e039731b96242995050f069e] Changeset [cc0e6ddec4437027e039731b96242995050f069e] by Yehuda Katz

Committed by Yehuda Katz

[5e4a862e856bd0a5b90deebbf2be3340a8955b6a] Changeset [5e4a862e856bd0a5b90deebbf2be3340a8955b6a] by Yehuda Katz

Merge commit 'adelcambre/sprint' into sprint http://github.com/wycats/merb-co...

Committed by Yehuda Katz

[1c01aa36a766874102d8deeb8b481046656b7753] Changeset [1c01aa36a766874102d8deeb8b481046656b7753] by Yehuda Katz

Merge branch 'master' of git@github.com:wycats/merb-core http://github.com/wycats/merb-co...

Committed by Yehuda Katz

[284933f51f42df41d2ddf42092f925f247640751] Changeset [284933f51f42df41d2ddf42092f925f247640751] by Yehuda Katz

Committed by Yehuda Katz

[38fc48a694d9dc3eb755f4b461f2dadb4de32c9b] Changeset [38fc48a694d9dc3eb755f4b461f2dadb4de32c9b] by Andy Delcambre

Merge commit 'mtodd/master'

Conflicts:

lib/merb-core/dispatch/router.rb
lib/merb-core/dispatch/router/behavior.rb
lib/merb-core/rack/helpers.rb

http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[db7c1a2c728b9d5aad57da900391195252a023ab] Changeset [db7c1a2c728b9d5aad57da900391195252a023ab] by Matt Todd

Merge branch 'master' of git://github.com/wycats/merb-core http://github.com/wycats/merb-co...

Committed by Matt Todd

[457c28237b6f870a815b228f1d7339c76b05e5da] Changeset [457c28237b6f870a815b228f1d7339c76b05e5da] by Matt Todd

Added docuemntation for the Router and the Router::Behavior and Router::Proxy. http://github.com/wycats/merb-co...

Committed by Matt Todd

[19a3402711af8eaa1a4a706b951308e24ea8d1e9] Changeset [19a3402711af8eaa1a4a706b951308e24ea8d1e9] by Matt Todd

Added documentation for Rack::Helpers. http://github.com/wycats/merb-co...

Committed by Matt Todd

[a1ddda3421f6381a2f7240cbd614377e06c42a8f] Changeset [a1ddda3421f6381a2f7240cbd614377e06c42a8f] by Andy Delcambre

Merge branch 'sprint' of git://github.com/dcolthorp/merb-core http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[b9b87a7443611995dd97cfc40104bc6cfbffde53] Changeset [b9b87a7443611995dd97cfc40104bc6cfbffde53] by Drew Colthorp

Merge branch 'sprint' of git://github.com/wycats/merb-core into sprint

Conflicts:

lib/merb-core/bootloader.rb

http://github.com/wycats/merb-co...

Committed by Drew Colthorp

[7b65fa5cab9129799a7cdc15afb15233e76ed16d] Changeset [7b65fa5cab9129799a7cdc15afb15233e76ed16d] by Andy Delcambre

Merge branch 'sprint' of git://github.com/wycats/merb-core http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[9074828458dbc560cb189dee5fdf1f55547c0d04] Changeset [9074828458dbc560cb189dee5fdf1f55547c0d04] by Andy Delcambre

Rack inline documentation http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[e7cbe925c04d322823e0a6afcc05e586d5c3b0b5] Changeset [e7cbe925c04d322823e0a6afcc05e586d5c3b0b5] by Drew Colthorp

Committed by Drew Colthorp

[1d8fc893991eac80f469658f0745a3f55df98191] Changeset [1d8fc893991eac80f469658f0745a3f55df98191] by Daniel Neighman

Fixes the request helper http://github.com/wycats/merb-co...

Committed by Daniel Neighman

[5737a09475cf06a0ac21789bb3091bf3f2372dde] Changeset [5737a09475cf06a0ac21789bb3091bf3f2372dde] by Yehuda Katz

Merge branch 'sprint' of git@github.com:wycats/merb-core into sprint http://github.com/wycats/merb-co...

Committed by Yehuda Katz

[671699bddd373f94bffbfe993bfaee686c558b30] Changeset [671699bddd373f94bffbfe993bfaee686c558b30] by Yehuda Katz

Committed by Yehuda Katz

[ad0a29856639e81465a691040008832ed023484d] Changeset [ad0a29856639e81465a691040008832ed023484d] by Drew Colthorp

Make checking for missing locals a little bit faster when rendering partials http://github.com/wycats/merb-co...

Committed by Drew Colthorp

[40cc199d99067a0cf3baf72a85b3ef531414dcd5] Changeset [40cc199d99067a0cf3baf72a85b3ef531414dcd5] by Andy Delcambre

updated filter chain documentation in abstract controller http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[a43bd42d1b5739639fb02c7a4d2e0f217ef31a56] Changeset [a43bd42d1b5739639fb02c7a4d2e0f217ef31a56] by Andy Delcambre

updated documentation everywhere for the url() method http://github.com/wycats/merb-co...

Committed by Andy Delcambre

[d4003c983169052551eb884f456600fc826bfa55] Changeset [d4003c983169052551eb884f456600fc826bfa55] by Matt Todd

Updated documentation for ControllerMixin. http://github.com/wycats/merb-co...

Committed by Matt Todd

[3b062ce8f14314b32677065721936937309ef1cc] Changeset [3b062ce8f14314b32677065721936937309ef1cc] by Matt Todd

Committed by Matt Todd

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »