47c51ec2db5e87461ab3cad585cd54413a76b50f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/c2d3dfdf84a3bbd84c17dd3095fb01296132db52 c2d3dfdf84a3bbd84c17dd3095fb01296132db52

2008-12-16T11:47:21-08:00

Bumping version for release 6de5a99d2557b4b63484d5e7bc90d8e139a0dc5e Yehuda Katz wycats@gmail.com cce0dd95ab7f3d875fdc5a2af5a775733060ce5c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/47c51ec2db5e87461ab3cad585cd54413a76b50f 47c51ec2db5e87461ab3cad585cd54413a76b50f

2008-12-16T11:37:22-08:00

Support :require_as => nil, improve errors c2c0b53565c23baa227fa7b4d849c0abc02bacf3 Yehuda Katz wycats@gmail.com 677d08b9dd972367369a509987264ded25e70f9a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/cce0dd95ab7f3d875fdc5a2af5a775733060ce5c cce0dd95ab7f3d875fdc5a2af5a775733060ce5c

2008-12-16T09:56:29-08:00

Fixes thorfile e5b10a65631c05d548943aa2dce44b40952a0e9f Yehuda Katz wycats@gmail.com d5c1e89c82d0684874155a83e62698c58f55f80d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/677d08b9dd972367369a509987264ded25e70f9a 677d08b9dd972367369a509987264ded25e70f9a

2008-12-15T19:21:20-08:00

Allow disabling escape_xml 52d9660a65129a41c3d3f37684e0c8f8b00c6d39 Yehuda Katz wycats@gmail.com 2435f86119ff923676d68d73fb47f4b1fb3df7e7 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/d5c1e89c82d0684874155a83e62698c58f55f80d d5c1e89c82d0684874155a83e62698c58f55f80d

2008-12-15T19:20:40-08:00

Update Merb profiler to output call tree d8f9fdf4eb2fa6b516b356627a5dd2c8b0ec60a5 Yehuda Katz wycats@gmail.com 14e5d1d55b2709f19369d30cc5f8c720b1dce137 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/2435f86119ff923676d68d73fb47f4b1fb3df7e7 2435f86119ff923676d68d73fb47f4b1fb3df7e7

2008-12-15T17:45:37-08:00

Updates merb-gen to supply the merb.thor directory and hack around some issues with templater 68b0eac3d46575b362e433d28cb257a8da0d0dbb Yehuda Katz wycats@gmail.com 66c393b31bb93e5a26c2b0c08fcc9039c61d9499 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/14e5d1d55b2709f19369d30cc5f8c720b1dce137 14e5d1d55b2709f19369d30cc5f8c720b1dce137

2008-12-15T16:25:08-08:00

merb.thor now requires thor 0.9.9 for thor bundles 1dab4998a2914312cca717f621de8260985b708a Yehuda Katz wycats@gmail.com 3096c116d06a6b2281ead61a16dca530b4a241cd Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/66c393b31bb93e5a26c2b0c08fcc9039c61d9499 66c393b31bb93e5a26c2b0c08fcc9039c61d9499

2008-12-14T11:13:42-08:00

2008-12-14T11:07:09-08:00

Remove autoload to work around bug in Ruby's autoload 70426892f44fc809f2650d35de4439cd1b006c4b Yehuda Katz wycats@gmail.com 1b8f3e52e7f3189a80b05966f7e8449c6628374d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/3096c116d06a6b2281ead61a16dca530b4a241cd 3096c116d06a6b2281ead61a16dca530b4a241cd

2008-12-14T11:13:41-08:00

2008-12-14T11:06:23-08:00

Add licenses for two files in tools that inadvertantly did not include them. 31cb99fccd0f241e389532ebc8f617cd4905addd Yehuda Katz wycats@gmail.com 857c523fa68bd94075d1b7217e787a710d76f06f Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/1b8f3e52e7f3189a80b05966f7e8449c6628374d 1b8f3e52e7f3189a80b05966f7e8449c6628374d

2008-12-12T19:49:26-08:00

2008-12-12T19:47:18-08:00

added automigration to the default merb stack spec helper. 63271a601c02f1cf6055084a4aaab39f0877c06f Matt Aimonetti mattaimonetti@gmail.com e70f00d3b2028554fe585b903370f9647561af9c Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/857c523fa68bd94075d1b7217e787a710d76f06f 857c523fa68bd94075d1b7217e787a710d76f06f

2008-12-12T19:22:29-08:00

2008-12-12T19:19:24-08:00

fixed the request spec example 6491987c96aead61f7a59b42abcff1356cad44fd Matt Aimonetti mattaimonetti@gmail.com 21a3add8d89e496770647643bfce6557ab8f8a8d 84f61f3976193e38d45e5288609c8056c8e1a56f Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/e70f00d3b2028554fe585b903370f9647561af9c e70f00d3b2028554fe585b903370f9647561af9c

2008-12-12T19:20:58-08:00

Merge branch 'master' of git@github.com:wycats/merb into 1.0.x * 'master' of git@github.com:wycats/merb: added documentation about adding date formats. Closing [#1028] d8bf3767252ef2ab824f6160a2d2c006a481e3ed Matt Aimonetti mattaimonetti@gmail.com 49f2208b75b9ce6760f3beb416afea7f8f94906c Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/21a3add8d89e496770647643bfce6557ab8f8a8d 21a3add8d89e496770647643bfce6557ab8f8a8d

2008-12-12T19:13:52-08:00

2008-12-12T19:03:36-08:00

Cleaned up the merb-slice generator, added requests specs d8bf3767252ef2ab824f6160a2d2c006a481e3ed Matt Aimonetti mattaimonetti@gmail.com 573a9a32166d404546e4140555691fa588787790 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/49f2208b75b9ce6760f3beb416afea7f8f94906c 49f2208b75b9ce6760f3beb416afea7f8f94906c

2008-12-12T19:10:05-08:00

2008-12-11T20:03:52-08:00

Spec and fix XSS issues with form helpers (Dirkjan Bussink) f49823873adc69a1fec204da9a3cde896cdeaae5 Matt Aimonetti mattaimonetti@gmail.com da1fb2d25175ab1eb8a52ecfd23a9797581e69d0 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/573a9a32166d404546e4140555691fa588787790 573a9a32166d404546e4140555691fa588787790

2008-12-11T00:23:32-08:00

2008-12-11T00:19:54-08:00

cleaned up the default generated controller 79e72923448315aa1a3f2536a3464773e4e2ed13 Matt Aimonetti mattaimonetti@gmail.com 03769e13de480cdf5b538007470175db50dcd44f Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/da1fb2d25175ab1eb8a52ecfd23a9797581e69d0 da1fb2d25175ab1eb8a52ecfd23a9797581e69d0

2008-12-10T17:25:43-08:00

2008-12-10T17:14:08-08:00

modified the specs to not use a private API method, still 2 failing specs tho fa5d17c3a85d4b37b8e5aa0304ffa32379a51c5c Matt Aimonetti mattaimonetti@gmail.com b48a3d2835c5b27212adf6cbb0bb8c347059cb94 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/03769e13de480cdf5b538007470175db50dcd44f 03769e13de480cdf5b538007470175db50dcd44f

2008-12-10T17:25:25-08:00

2008-12-10T16:15:40-08:00

fixed the slice lib file which was calling a private API method (broke when we change the private API in 1.0.4) I also commented out the old slice specs using dispatch_to We need to add some request spec examples ecadiff --git a/merb-slices/lib/generators/templates/full/lib/%base_name%.rb b/merb-slices/lib/generators/templates/full/lib/%base_name%.rb index 33896cd..572efea 100644 --- a/merb-slices/lib/generators/templates/full/lib/%base_name%.rb +++ b/merb-slices/lib/generators/templates/full/lib/%base_name%.rb @@ -2,7 +2,7 @@ if defined?(Merb::Plugins) $:.unshift File.dirname(__FILE__) - load_dependency 'merb-slices' + dependency 'merb-slices', :immediate => true Merb::Plugins.add_rakefiles "<%= base_name %>/merbtasks", "<%= base_name %>/slicetasks", "<%= base_name %>/spectasks" # Register the Slice for the current host application e96025f76089d915ace27d023b3f8f5309e6cbf5 Matt Aimonetti mattaimonetti@gmail.com 3b37a4adfe3b4737aff39eedf5f8d4b4471ec838 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/b48a3d2835c5b27212adf6cbb0bb8c347059cb94 b48a3d2835c5b27212adf6cbb0bb8c347059cb94

2008-12-10T11:11:39-08:00

Updating to 1.0.5 and some release tweaks 5ba8a7b0db1aab645db13c8f81fbf3f45024412e Yehuda Katz wycats@gmail.com c07736a650810debfb8376515d04394b2d33ac11 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/3b37a4adfe3b4737aff39eedf5f8d4b4471ec838 3b37a4adfe3b4737aff39eedf5f8d4b4471ec838

2008-12-08T13:20:54-08:00

Adds merb-more to list of gems to release 8f265789f79207d8658ceb3a1c32b41eb7cfbd26 Yehuda Katz wycats@gmail.com 17760a66330182f3af8ef05937811da748edef90 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/c07736a650810debfb8376515d04394b2d33ac11 c07736a650810debfb8376515d04394b2d33ac11

2008-12-08T13:08:49-08:00

Another tweak to release process a3441f64710bceaad40d6d416202d701e5e07df6 Yehuda Katz wycats@gmail.com 0bec13c87895d8d89d907c6c3c911e55001aaefe 2b4fdc365c04500a7d52ac0a9dc2a7290c6ac85a Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/17760a66330182f3af8ef05937811da748edef90 17760a66330182f3af8ef05937811da748edef90

2008-12-08T12:12:43-08:00

Merge branch '1.0.x' of git@github.com:wycats/merb into 1.0.x 8b64eefcfed821118f01d1e0acea7280d91d2552 Yehuda Katz wycats@gmail.com a5a136f44502418b0632e886381a93ee5142cc1c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/0bec13c87895d8d89d907c6c3c911e55001aaefe 0bec13c87895d8d89d907c6c3c911e55001aaefe

2008-12-08T12:11:48-08:00

Fixing up release stuff feb03ba76e0fce3aa030433b89b4610c2e4e9d89 Yehuda Katz wycats@gmail.com a5a136f44502418b0632e886381a93ee5142cc1c Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/2b4fdc365c04500a7d52ac0a9dc2a7290c6ac85a 2b4fdc365c04500a7d52ac0a9dc2a7290c6ac85a

2008-12-05T11:20:31-08:00

2008-12-05T11:09:03-08:00

added documentation about adding date formats. Closing [#1028] ca880bde1bbf0e239f1cea4ee6e009496371c34e Matt Aimonetti mattaimonetti@gmail.com 99eee3c1b9e43cde0fda6a677e6999f8b7e2ce36 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/84f61f3976193e38d45e5288609c8056c8e1a56f 84f61f3976193e38d45e5288609c8056c8e1a56f

2008-12-05T11:09:03-08:00

added documentation about adding date formats. Closing [#1028] 218c42b99a4a10c92d34ca4fb3c65041e93ef387 Matt Aimonetti mattaimonetti@gmail.com 698fa5015e15a05a3bbfc69eb2f838b27ef7bfec Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/a5a136f44502418b0632e886381a93ee5142cc1c a5a136f44502418b0632e886381a93ee5142cc1c

2008-12-04T15:54:40-08:00

A bunch of perf improvements: * Completely redid content negotiation * Modified Merb.logger.* to take a block for deferred processing * Added some more constants for use in mime processing df6d0c3e765349ff818a25a6f054bb9b23f4adc7 Yehuda Katz wycats@gmail.com 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