ivey's merb-core Feed  

c607f38884a1c85541762cb788811120fbf61332

Set @_content_type before running transform blocks

65c7ce34c94b16251b8ab56d2a163058523c0ac4

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

c4844d90052a530aec0bd43a0fa4acdd5de47e47

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

49f4fb672d27f78b2cd9c3c900a4defb456ad9ea

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

5c8e250a58023fdd4a7cfec32fb47b17fed90b62

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

3af4e28937f6b91a02c6d778953255fe9437db9a

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

77abbd489ad55378e59aad068605a17124d144e9

Improve the speed of _perform_content_negotiation (and got 10% better speed on requests)

4ca2ac1d1fe3c59a110628945ac87c7385eda70d

Old stuff that should be committed.

7ea36e39165fb19e7f28939196b57534be52da4f

Speed up synonym lookup by order of magnitude :(

af250aa890e370e40d4b75feefb2f10cf7dff613

sneaky merge failure piece that shouldn't be here

6155eae38811b4a8676530786fdedf48ba46cdea

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

9238c0a2d1cce49beafb165bab8ad6513821b83e

Merge wycats' HEAD

d9ab75d1528d1b7d1395ac9293086c7141044e06

Send the route into the controller

e1cf872bf65d59581068bdac046da10b01cbedce

Revert "Add specs for action-level only_provides"

068dc9a216aeff1579bdf62c75f2ef0d07dcf4c2

Revert "add specs for does_not_provide"

e12be9a6c4c8deca3b524d5db1cfb437b5c15d32

add specs for does_not_provide

48ffb720433baaf4a5e0a80f5a4e41758003562a

Add specs for action-level only_provides

86b036c0461529a04ee003be5bab7051f633e10d

Make controller.route work

e952370697405da1a7a82ae5707af2e073dae92f

move fixation check into session()

69b0af440c26bf218c1098461df2fb398e129909

Add Merb.frozen and change how dependency() works when frozen? == true

ca92bdfc89afda04cbb4fd3d3e5848648cc0b326

Fixes a small bug that was causing some specs to fail

eab8c1f05924eb6fe739a1085ead5484a60467bf

Includes the get, post, put, and delete spec (test) helpers and their multipart counterparts.

39fa1cc46deac8dffa3806d971d6482700f54b9f

at long last, apply the frozen gems dir patch / thanks dcparker for championing this

13ce57a8bcb9a546438bfda5c75af027471bccfe

better error handling on merb -k / thanks kevin

7cb35edc4558a76659134a2529be6c9019937941

fixed bug causing cookie expiration to be set once at server start. now correctly calculate it when setting it. thanks vann

53d421e26d5c93d8e68149361be8f737da94a8e6

don't escape cookie until we set it / thanks dbalmain

3019270752022159f7da7b3395c3416c836ebe29

Fixes a bug in responder, and the dispatch_to helper