bd456640ba1a970e6796781d2bd25a302695e2aa Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/30d90d39595d291496e674f2bd79d7777467fa73 30d90d39595d291496e674f2bd79d7777467fa73 2008-12-28T16:30:03-08:00 2008-12-28T16:30:03-08:00 Fixes bug in merb-auth caught by step-by-step tester 5891c5cd2206483e5d5b63100549bfd11fabd179 Yehuda Katz wycats@gmail.com b597b9f13ff5db065bda8b1fdd8d6b64bb82b075 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/bd456640ba1a970e6796781d2bd25a302695e2aa bd456640ba1a970e6796781d2bd25a302695e2aa 2008-12-28T15:43:48-08:00 2008-12-28T15:43:48-08:00 Fixes issue with unusual defaults in ActionArgs by using unifier 30fcc4b8ae2240b3a94665382a17135169dde618 Yehuda Katz wycats@gmail.com 529be96fc8cb418709a96f3fd8ed6c20b277c159 Jacques Crocker merbjedi@gmail.com http://github.com/wycats/merb/commit/b597b9f13ff5db065bda8b1fdd8d6b64bb82b075 b597b9f13ff5db065bda8b1fdd8d6b64bb82b075 2008-12-28T15:34:45-08:00 2008-12-16T14:57:20-08:00 Addresses Bug with Merb-Helpers regarding displaying label fields. label("Name", :for => "name") should now be working. Has been fixed with matching specs. Fix for #1055 http://merb.lighthouseapp.com/projects/7433/tickets/1055 159186e7549347e61834ce0a0fe87efc13c7b2b9 Yehuda Katz wycats@gmail.com 3d38b07d424d35c99c60bbd4e51ebd542b544b0e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/529be96fc8cb418709a96f3fd8ed6c20b277c159 529be96fc8cb418709a96f3fd8ed6c20b277c159 2008-12-28T15:31:31-08:00 2008-12-28T15:31:31-08:00 Adds information to defer_to to clear up some confusion 4573619e2a216f40252f0f6d1122600df6f2af8e Yehuda Katz wycats@gmail.com 376492c0063bb61c5654ac778070465757f261b0 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/3d38b07d424d35c99c60bbd4e51ebd542b544b0e 3d38b07d424d35c99c60bbd4e51ebd542b544b0e 2008-12-28T15:17:57-08:00 2008-12-28T15:17:57-08:00 Fixes one issue with thor bundling 1abb0ef63169045d84b223ae6571751e8dabb1f3 Yehuda Katz wycats@gmail.com 014b3de4140622a660faaf6953f24d61d2ded496 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/376492c0063bb61c5654ac778070465757f261b0 376492c0063bb61c5654ac778070465757f261b0 2008-12-28T12:54:47-08:00 2008-12-28T12:54:47-08:00 request() now uses the full rack env you specify 358651da7b833c6150f7a580b058addb8df2a100 Yehuda Katz wycats@gmail.com a1fe5d91b670b1183f93db35886cf0a9f6de887b Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/014b3de4140622a660faaf6953f24d61d2ded496 014b3de4140622a660faaf6953f24d61d2ded496 2008-12-28T12:54:01-08:00 2008-12-28T12:54:01-08:00 Removed embedded gems in test app aa83d382643f6723374785010e884439c70e1337 Yehuda Katz wycats@gmail.com e36ab2a50e5c6648cc2cb253df662a4c608cd2ff Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/a1fe5d91b670b1183f93db35886cf0a9f6de887b a1fe5d91b670b1183f93db35886cf0a9f6de887b 2008-12-28T12:39:07-08:00 2008-12-28T12:39:07-08:00 Fixes outdated documentation of merb_mailer 112dae3e0c08722dfe9e93ac167623558b701029 Yehuda Katz wycats@gmail.com 48a063d875b2b4f3e82ed728a987e8212198aaca Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/e36ab2a50e5c6648cc2cb253df662a4c608cd2ff e36ab2a50e5c6648cc2cb253df662a4c608cd2ff 2008-12-28T12:22:47-08:00 2008-12-28T12:22:47-08:00 Only drop pid if going into daemonized mode. This fixes all the issues people were having with pids getting wiped for merb -i, rake db:automigrate, etc. de3a8dea9403e9bac8372e2a3c13d60341c96c81 Yehuda Katz wycats@gmail.com 7243f0a6fb16f03c5b5e255f095c91ced9654e06 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/48a063d875b2b4f3e82ed728a987e8212198aaca 48a063d875b2b4f3e82ed728a987e8212198aaca 2008-12-28T12:09:45-08:00 2008-12-28T12:09:45-08:00 Fix issue with absolute path and implied locals 051891fbde9a24ddd67d86d29f6b1ac8a5e87689 Yehuda Katz wycats@gmail.com d2afd9c19ad7d4e16f06930c21168b4b9712b7e4 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/7243f0a6fb16f03c5b5e255f095c91ced9654e06 7243f0a6fb16f03c5b5e255f095c91ced9654e06 2008-12-28T10:59:27-08:00 2008-12-28T10:59:27-08:00 Update generator to correctly ignore all gems/gems and put in DM and do_sqlite3 into generated deps.rb a6d4af7db8a8c3e8ceda66b7f1f0f2fcd3dd9936 Yehuda Katz wycats@gmail.com 965dca169bd09627e2698aed5341b5d736775af0 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/d2afd9c19ad7d4e16f06930c21168b4b9712b7e4 d2afd9c19ad7d4e16f06930c21168b4b9712b7e4 2008-12-28T10:58:51-08:00 2008-12-28T10:58:51-08:00 Cache _templates_for to speed up rendering cd98928e61a01b5961c463212124aa4f1ca2641b Yehuda Katz wycats@gmail.com 5947c3943b456b41e2fdec6f806f301f61c9fdb1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/965dca169bd09627e2698aed5341b5d736775af0 965dca169bd09627e2698aed5341b5d736775af0 2008-12-28T10:58:20-08:00 2008-12-28T10:58:20-08:00 Simplify basic auth 2f5a3de14d356ecac0c8c32b1202157bc3d358a9 Yehuda Katz wycats@gmail.com b8f44303c04a390b5f1d2f0fc11cc47206202cd1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/5947c3943b456b41e2fdec6f806f301f61c9fdb1 5947c3943b456b41e2fdec6f806f301f61c9fdb1 2008-12-16T14:45:06-08:00 2008-12-16T14:45:06-08:00 Prepping 1.0.6.1 release d432a7ac74110b40c74dc9fbff447889479d6ebc Yehuda Katz wycats@gmail.com 6e10e285e70a242af6e62fc892b03a4217af8c6f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/b8f44303c04a390b5f1d2f0fc11cc47206202cd1 b8f44303c04a390b5f1d2f0fc11cc47206202cd1 2008-12-16T14:21:37-08:00 2008-12-16T14:21:37-08:00 Bump version for nightly release 32a0379dc2393dfb652e96e2503a17973fccbca7 Yehuda Katz wycats@gmail.com c2d3dfdf84a3bbd84c17dd3095fb01296132db52 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/6e10e285e70a242af6e62fc892b03a4217af8c6f 6e10e285e70a242af6e62fc892b03a4217af8c6f 2008-12-16T14:20:32-08:00 2008-12-16T14:20:32-08:00 Small fix for regression (unknown cause) 0722cc29a7b16a1492bf0e425929c6175368f03a Yehuda Katz wycats@gmail.com 47c51ec2db5e87461ab3cad585cd54413a76b50f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/c2d3dfdf84a3bbd84c17dd3095fb01296132db52 c2d3dfdf84a3bbd84c17dd3095fb01296132db52 2008-12-16T11:47:21-08:00 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 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 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 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 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 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 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 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