31a22e715a44f3f10b98b0d26f4099a1f0f48a39 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/698fa5015e15a05a3bbfc69eb2f838b27ef7bfec 698fa5015e15a05a3bbfc69eb2f838b27ef7bfec

2008-12-02T18:55:52-08:00

Don't display trace options in production mode [#1088 state:resolved] f6f1f58723fffd040ac47ba3ca0885b6e3a4af06 Yehuda Katz wycats@gmail.com dc7cf8f0c7fe60d470d039f06a037c39a7b730c5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/31a22e715a44f3f10b98b0d26f4099a1f0f48a39 31a22e715a44f3f10b98b0d26f4099a1f0f48a39

2008-12-02T18:53:21-08:00

Make this debugging message only on in verbose mode c965d1bf9f6e24e271ba290d0062121552b3c278 Yehuda Katz wycats@gmail.com 6484c4166c9282298f2456601c145006dae37d74 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/dc7cf8f0c7fe60d470d039f06a037c39a7b730c5 dc7cf8f0c7fe60d470d039f06a037c39a7b730c5

2008-12-02T18:42:01-08:00

2008-12-02T18:41:48-08:00

Leaving in ruby-debug == bad a4dc97e3319000dfdc33083402ebd5c66e4a6bee Yehuda Katz wycats@gmail.com 5ad63d963921eb09aef0bbf9b0dd2133b5f419e1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/6484c4166c9282298f2456601c145006dae37d74 6484c4166c9282298f2456601c145006dae37d74

2008-12-02T18:32:15-08:00

2.0 override file fda39580ceb909bd5fcd0d50f45c4ef544b80fe4 Yehuda Katz wycats@gmail.com 05e4f577f2bceffa7ddefbf62208ade9dd06e797 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/5ad63d963921eb09aef0bbf9b0dd2133b5f419e1 5ad63d963921eb09aef0bbf9b0dd2133b5f419e1

2008-12-02T18:31:58-08:00

Modify gem loading problems to use the original backtrace from when the dependency was declared fcd4c2a2d0bffa71773809280e2e7781ff648577 Yehuda Katz wycats@gmail.com a196747d7774d0e260689ab51f80cb6b87d2db1f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/05e4f577f2bceffa7ddefbf62208ade9dd06e797 05e4f577f2bceffa7ddefbf62208ade9dd06e797

2008-12-02T17:20:26-08:00

Adds merb-core/two-oh.rb to resolve #1025: * Required back-compat breakage * multipart_post and multipart_put now takes three parameters * path * params (values can be Files or IOs) * env: the same env that you would pass into #request * multipart_post returns the same object that #request returns * require "merb-core/two-oh" to activate these features 0348d3571815c0b9e41b0ad8f9ee811442372fb2 Yehuda Katz wycats@gmail.com 201a86ecdf418a0ffd07f02872e5034b8ce073b6 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/a196747d7774d0e260689ab51f80cb6b87d2db1f a196747d7774d0e260689ab51f80cb6b87d2db1f

2008-12-02T15:41:52-08:00

2008-12-02T15:41:36-08:00

Corrects README for cache to represent best practice for setup f3d5bcad962bcc31b086189368d0ef8423a9e134 Yehuda Katz wycats@gmail.com 5d52ab74c1abd0f253b8a11f245b13e771af5440 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/201a86ecdf418a0ffd07f02872e5034b8ce073b6 201a86ecdf418a0ffd07f02872e5034b8ce073b6

2008-12-02T15:34:57-08:00

Converts last-modified to time if it's a DateTime 2d405166449d44a1bfe699b9a94df811ef7cf28b Yehuda Katz wycats@gmail.com 1df670aef91d78b48109bd96c5bfe78d2cee4908 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/5d52ab74c1abd0f253b8a11f245b13e771af5440 5d52ab74c1abd0f253b8a11f245b13e771af5440

2008-12-02T14:19:15-08:00

Modifies reloading so it works correctly via constant removal method (for Windows and JRuby) bbe3829a66dc1bd3a1d6c524a6a4ec31fb770eb5 Yehuda Katz wycats@gmail.com 8625177573e43caec18257aa6a9828f26f232e0f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/1df670aef91d78b48109bd96c5bfe78d2cee4908 1df670aef91d78b48109bd96c5bfe78d2cee4908

2008-12-02T09:54:06-08:00

.map is no longer over lines in 1.9 (need to make that explicit) ea52a3df0e16a39cc130a81c22bd14a86c277f7e Yehuda Katz wycats@gmail.com 8ebec33fdb949a32ecac875c7252535f00001d69 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/8625177573e43caec18257aa6a9828f26f232e0f 8625177573e43caec18257aa6a9828f26f232e0f

2008-12-02T09:53:41-08:00

1.9 no longer yields self to the block, so that (undocumented) form of the router will no longer work in 1.9 3167882ef47039f09ad73a771cb4a1a38b1f2a80 Yehuda Katz wycats@gmail.com 0b25ce6d018a05a70021c08d1576c9eb018901a7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/8ebec33fdb949a32ecac875c7252535f00001d69 8ebec33fdb949a32ecac875c7252535f00001d69

2008-12-02T09:53:11-08:00

[].to_s changed in 1.9 f4acc407887d4cdcbf1906b78511ab118ee4c999 Yehuda Katz wycats@gmail.com 652c0727edfef143611912680399b506e610c215 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/0b25ce6d018a05a70021c08d1576c9eb018901a7 0b25ce6d018a05a70021c08d1576c9eb018901a7

2008-12-02T09:51:22-08:00

lambdas and procs are now different... use proc as intended 9c0c5252b738a7e66c2370ff386a823c464f4bf9 Yehuda Katz wycats@gmail.com abde59fa78c1fc516c6a96f9cfdabca01b05a78e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/652c0727edfef143611912680399b506e610c215 652c0727edfef143611912680399b506e610c215

2008-12-02T09:50:59-08:00

Spit out the invalid compiled router code when it fails to compile 3e1cf4c10f7f0f5616d1f6b615899c0ee63a844c Yehuda Katz wycats@gmail.com 7243c8c064e9ebf0b10689ea69331a7de429c40d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/abde59fa78c1fc516c6a96f9cfdabca01b05a78e abde59fa78c1fc516c6a96f9cfdabca01b05a78e

2008-12-02T09:50:36-08:00

[].to_s is "" in 1.8 and "[]" in 1.9, so don't use an Array when you want to_s to give you a concatenation of the string 107aea579d897c057ff1be8f2ca2f5a398f2465e Yehuda Katz wycats@gmail.com c487ca24174418842be26ebc4a06956e66b274ab Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/7243c8c064e9ebf0b10689ea69331a7de429c40d 7243c8c064e9ebf0b10689ea69331a7de429c40d

2008-12-02T09:49:59-08:00

Map all actions via to_s because in Ruby 1.9 methods are symbols (provide consistent 1.8 and 1.9 behavior) 61a5a5fcdd632c06199a02b95d611c8fe929ad2b Yehuda Katz wycats@gmail.com 24b34e057e6372ef3e509a30c4c180a88972fd33 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/c487ca24174418842be26ebc4a06956e66b274ab c487ca24174418842be26ebc4a06956e66b274ab

2008-12-02T09:49:31-08:00

Fix _evaluate_condition to not use invalid 1.9 syntax 0b8e6f070abdddeb328228453973b09f54575445 Yehuda Katz wycats@gmail.com b5b112e7dd12cd98cd5ffe83f061f2b385e5ceda Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/24b34e057e6372ef3e509a30c4c180a88972fd33 24b34e057e6372ef3e509a30c4c180a88972fd33

2008-12-02T09:49:08-08:00

Fix $KCODE to run only in versions of Ruby < 1.9 2de43b1dcd4d49a2f3fd8c4930077e091d8a6d81 Yehuda Katz wycats@gmail.com b392dfaaa1ccac622ed3dedab98214b2772dae5f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/b5b112e7dd12cd98cd5ffe83f061f2b385e5ceda b5b112e7dd12cd98cd5ffe83f061f2b385e5ceda

2008-12-01T14:57:02-08:00

2008-12-01T14:56:44-08:00

Fix all webrat-related badness in merb -i, and add merb.visit et al da55a67bad942c0271a4bfe6abf85f9ce4857909 Yehuda Katz wycats@gmail.com 43cb134cff7616452aaf182391359a22ae2ca7ed Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/b392dfaaa1ccac622ed3dedab98214b2772dae5f b392dfaaa1ccac622ed3dedab98214b2772dae5f

2008-11-30T17:17:13-08:00

2008-11-30T17:13:31-08:00

fixed request last_modified accessor when the header isn't set fadda4950709415b582833f80653ddbe847e4a12 Matt Aimonetti mattaimonetti@gmail.com ea8e7651bf08ca2a7e81cb227905affb826f5294 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/43cb134cff7616452aaf182391359a22ae2ca7ed 43cb134cff7616452aaf182391359a22ae2ca7ed

2008-11-30T14:43:52-08:00

Bump version to 1.0.4 f6d835026395a292c61ec64226f9ee23324c0c8b Yehuda Katz wycats@gmail.com e5f9ff262587d7e4502a6445225cc8f90b3ec038 Dudley Flanders dudley@misnomer.us http://github.com/wycats/merb/commit/ea8e7651bf08ca2a7e81cb227905affb826f5294 ea8e7651bf08ca2a7e81cb227905affb826f5294

2008-11-30T14:31:43-08:00

2008-11-02T17:34:10-08:00

Fix the default exception view so it doesn't error out when the source of a backtrace line is inside a jar file. Signed-off-by: Yehuda Katz <wycats@gmail.com> a18d8b495203b064919f5ba2d39802ab564464bc Yehuda Katz wycats@gmail.com acb1b38ca8fee6ec173fc3bb41e540ccdc43f17b Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/e5f9ff262587d7e4502a6445225cc8f90b3ec038 e5f9ff262587d7e4502a6445225cc8f90b3ec038

2008-11-27T09:30:24-08:00

2008-11-27T09:23:05-08:00

fixed a tiny bug which was making merb-helpers not compatible with ruby 1.8cvs and 1.9 f3cbcde79d1d297a9c393c855daba8197b5f2224 Matt Aimonetti mattaimonetti@gmail.com 99b5d09fa05d997afd98fe70301f9098e9676cd2 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/acb1b38ca8fee6ec173fc3bb41e540ccdc43f17b acb1b38ca8fee6ec173fc3bb41e540ccdc43f17b

2008-11-25T11:38:18-08:00

2008-11-25T11:32:03-08:00

Produces output on Merb.fatal! regardless of the log stream if STDOUT is tty? 633eb478969ee76fea2df1aa145ec7cdf70ea9ef Yehuda Katz wycats@gmail.com cdb515f85e4d10fb6ae31dbdae4cbe8fa1bf0bde Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/99b5d09fa05d997afd98fe70301f9098e9676cd2 99b5d09fa05d997afd98fe70301f9098e9676cd2

2008-11-25T11:37:49-08:00

applies patch by dudleyf [#960 state:resolved] 68d8551efcde7760612469b2f292ecf32431e0f7 Yehuda Katz wycats@gmail.com faa1e1fbbed7e97aa610e475ab7020db125f2287 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/cdb515f85e4d10fb6ae31dbdae4cbe8fa1bf0bde cdb515f85e4d10fb6ae31dbdae4cbe8fa1bf0bde

2008-11-25T10:36:52-08:00

Update release task to be relatively useful c563d3f1d00b6f48d2e7e6eedc6ecbf77c53b309 Yehuda Katz wycats@gmail.com 83860887996c8df7b5d93b10ca3c9d84aaae0c82 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/faa1e1fbbed7e97aa610e475ab7020db125f2287 faa1e1fbbed7e97aa610e475ab7020db125f2287

2008-11-25T09:57:42-08:00

Bumping to 1.0.3 f9ed4b536c878a8beebac9ce451f106b5fe6bd47 Yehuda Katz wycats@gmail.com 4343860a4959bf0bfd123b8701a1b4c24ea6d809 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/83860887996c8df7b5d93b10ca3c9d84aaae0c82 83860887996c8df7b5d93b10ca3c9d84aaae0c82

2008-11-25T09:49:23-08:00

Fixes a typo in 1.0.2 and the spec that should have caught it d9bfe1687cc83ac38cdaae54594d89c49e9ef2d4 Yehuda Katz wycats@gmail.com 8227129da4d173c514fd86d86834974547f947a9 Ben Burkert ben@benburkert.com http://github.com/wycats/merb/commit/4343860a4959bf0bfd123b8701a1b4c24ea6d809 4343860a4959bf0bfd123b8701a1b4c24ea6d809

2008-11-25T09:36:15-08:00

2008-11-18T13:21:32-08:00

added Merb.run_later Signed-off-by: Yehuda Katz <wycats@gmail.com> f14ef19252baeaafd5e30d252e4e47df5a3b2382 Yehuda Katz wycats@gmail.com c0e4bcb183a8f06ef9698d3aa28df615cbb569c7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/8227129da4d173c514fd86d86834974547f947a9 8227129da4d173c514fd86d86834974547f947a9

2008-11-24T18:29:26-08:00

[#1057 state:resolved] Fixes missing space in TemplateNotFound 242f20fb4b6ee4fc0d559600ceca6cac152b47da Yehuda Katz wycats@gmail.com