0fc1a185a418061c06597f032f9a5e551719c1a4 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-core/commit/384685cc991b912aa369c95f0345294c3c1ac510 384685cc991b912aa369c95f0345294c3c1ac510 2008-03-04T21:46:12-08:00 2008-03-04T21:46:12-08:00 change dependency() to use gem() instead of Gem.activate 857864f3df22c4a1c9086067563ef42d205fed51 Michael D. Ivey ivey@gweezlebur.com e442ea7787b119a127633ad9c28d57ee2a32505f f891d8dbec205bc81eb1bf733f9079025b03a362 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/0fc1a185a418061c06597f032f9a5e551719c1a4 0fc1a185a418061c06597f032f9a5e551719c1a4 2008-03-04T18:27:53-08:00 2008-03-04T18:27:53-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 74e85ec6a354d0d5a091b6b86be81f3649b12440 Yehuda Katz wycats@gmail.com 826d11734cd188ed0c4ff32507a5c4a79a259689 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/e442ea7787b119a127633ad9c28d57ee2a32505f e442ea7787b119a127633ad9c28d57ee2a32505f 2008-03-04T17:13:57-08:00 2008-03-04T17:13:57-08:00 As a last resort, look for */* in the formats before throwing NotAcceptable (TODO: Clean this up) 4e8255ebaebb9bd16fac737426dc7703e68430ea Yehuda Katz wycats@gmail.com 8c27e9c3d588ffb19f571539711fcc375db99c43 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/f891d8dbec205bc81eb1bf733f9079025b03a362 f891d8dbec205bc81eb1bf733f9079025b03a362 2008-03-04T16:53:04-08:00 2008-03-04T16:53:04-08:00 really remove hooks 8095810afd665f7400e00c29c5595de6bf2f86d2 Ezra Zygmuntowicz ez@engineyard.com 826d11734cd188ed0c4ff32507a5c4a79a259689 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/8c27e9c3d588ffb19f571539711fcc375db99c43 8c27e9c3d588ffb19f571539711fcc375db99c43 2008-03-04T16:50:13-08:00 2008-03-04T16:50:13-08:00 don't require hook.rb 88d24cf869c608a24799afc1863a35ccc309e462 Ezra Zygmuntowicz ez@engineyard.com 315e3c81828d33694d3ef279060dbac09a56aadc 0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/826d11734cd188ed0c4ff32507a5c4a79a259689 826d11734cd188ed0c4ff32507a5c4a79a259689 2008-03-04T15:53:56-08:00 2008-03-04T15:53:56-08:00 Merge branch 'master' of git@github.com:wycats/merb-core bd484a14f9cb51c1c5272c3e1d4729954ec9dfbe Yehuda Katz wycats@gmail.com 4faa93bc6561fa9366dcb97e89775a08d29c086d Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/315e3c81828d33694d3ef279060dbac09a56aadc 315e3c81828d33694d3ef279060dbac09a56aadc 2008-03-04T15:53:03-08:00 2008-03-04T15:53:03-08:00 Fix perform_content_negotiation to correctly handle :format in params. Fix render_* to correctly return the correct content_type. 7926e9b8928d9d66aba5a5c685ff3663d418e677 Yehuda Katz wycats@gmail.com fad650f492effd0393d8c6ed393e834ce9160bd7 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081 0b4fb97bf89c9241b2d6a7f26decee2e7a7fc081 2008-03-04T15:04:24-08:00 2008-03-04T15:04:24-08:00 remove hooks.rb, they were premature and only used in one place session sotres now need to use setup_session and finalize_session rather then hooks b22fa46ec7cd1d376ca8cec74dd3b11e9fece27b Ezra Zygmuntowicz ez@engineyard.com 17fa804630498330f69f46765c4ef6a4f4eb405a 4faa93bc6561fa9366dcb97e89775a08d29c086d Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/fad650f492effd0393d8c6ed393e834ce9160bd7 fad650f492effd0393d8c6ed393e834ce9160bd7 2008-03-04T13:34:12-08:00 2008-03-04T13:34:12-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 66830f510645a66d18adebbcfd69ec92274425af Ezra Zygmuntowicz ez@engineyard.com bf38f7948cdcb9a05a1177604d80b87558777987 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/17fa804630498330f69f46765c4ef6a4f4eb405a 17fa804630498330f69f46765c4ef6a4f4eb405a 2008-03-04T13:33:51-08:00 2008-03-04T13:33:51-08:00 fix evented mongrel to not go crazy 61e05b8f14e95b14bd2866b4df35e9268960ae24 Ezra Zygmuntowicz ez@engineyard.com 7a1c3e23354621f680554ee0bd3e873dff4b22c7 bf38f7948cdcb9a05a1177604d80b87558777987 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/4faa93bc6561fa9366dcb97e89775a08d29c086d 4faa93bc6561fa9366dcb97e89775a08d29c086d 2008-03-04T13:30:04-08:00 2008-03-04T13:30:04-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 4827bfa468245954d5ac2d9c8b1c5480c3fc5600 Yehuda Katz wycats@gmail.com 539dd037b1845e13c11203ce10986898c52b4fd3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7a1c3e23354621f680554ee0bd3e873dff4b22c7 7a1c3e23354621f680554ee0bd3e873dff4b22c7 2008-03-04T13:28:50-08:00 2008-03-04T13:28:50-08:00 Calling /foo.pdf should throw a 406 if :pdf is not a registered mime. f75b8540acc02b6bc86dce9f6549c258e056b368 Yehuda Katz wycats@gmail.com 66e0e524e72106234051371b859912befff7f670 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/bf38f7948cdcb9a05a1177604d80b87558777987 bf38f7948cdcb9a05a1177604d80b87558777987 2008-03-04T13:14:47-08:00 2008-03-04T13:14:47-08:00 touch up dispatcher a bit, remove some un-needed code from the hot path ef98abc73a26ebb068bbb8074e1869224cd49d5a Ezra Zygmuntowicz ez@engineyard.com 31634b395abd6d690ebbb98a113e7e70aaf64ffd Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/66e0e524e72106234051371b859912befff7f670 66e0e524e72106234051371b859912befff7f670 2008-03-04T13:01:38-08:00 2008-03-04T13:01:38-08:00 fix dispatcher to not parse the params twice, still supports request_params 812b41a7e76a0bf160de576d04c38d4e70af2414 Ezra Zygmuntowicz ez@engineyard.com 44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/539dd037b1845e13c11203ce10986898c52b4fd3 539dd037b1845e13c11203ce10986898c52b4fd3 2008-03-04T12:47:54-08:00 2008-03-04T12:47:54-08:00 Should resolve #180 (Exception in exception.html.erb) b784a8d1696ec23519390eaeff8c362ff90613af Yehuda Katz wycats@gmail.com adc9ccd6d1636562a15a9662ae49fd97f4524a81 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/31634b395abd6d690ebbb98a113e7e70aaf64ffd 31634b395abd6d690ebbb98a113e7e70aaf64ffd 2008-03-04T12:36:35-08:00 2008-03-04T12:36:35-08:00 fix some specs to not rebuild the router every iteration 7d61be6bff743026cc56f7da0988c0637ccfe885 Ezra Zygmuntowicz ez@engineyard.com 44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 Janne Asmala janne@mindvalley.com http://github.com/wycats/merb-core/commit/adc9ccd6d1636562a15a9662ae49fd97f4524a81 adc9ccd6d1636562a15a9662ae49fd97f4524a81 2008-03-04T12:31:09-08:00 2008-03-01T20:36:15-08:00 Test documentation Documentation for all methods in Merb::Test. Signed-off-by: Ezra Zygmuntowicz <ez@engineyard.com> 132ce836b4f5834389ef17f0d0f5787c0866d9a5 Ezra Zygmuntowicz ez@engineyard.com 6793ef9897e5ee6c11f0d29b743dbc9989fa722c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 44774a2a892e23ef9aeaed2f9860bdc3b5bdf5a3 2008-03-04T12:29:56-08:00 2008-03-04T12:29:56-08:00 Resolves #181 (Special chars in static filenames) 326bc4957c200e0bc8dca401d833990860e4d7be Yehuda Katz wycats@gmail.com f23889f34b791e7e2c0c1ec14be47f7577999d20 Loren Segal lsegal@soen.ca http://github.com/wycats/merb-core/commit/6793ef9897e5ee6c11f0d29b743dbc9989fa722c 6793ef9897e5ee6c11f0d29b743dbc9989fa722c 2008-03-03T20:00:18-08:00 2008-03-03T20:00:18-08:00 Install gem with --local so it won't poll remote servers for updates during install 5db13f555e13fdff3c7d0da6b613261f3b6a6b93 Loren Segal lsegal@soen.ca 6a54e6c391aa01a9223d2b85772c539fa078214b Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/f23889f34b791e7e2c0c1ec14be47f7577999d20 f23889f34b791e7e2c0c1ec14be47f7577999d20 2008-03-03T16:10:37-08:00 2008-03-03T16:10:37-08:00 cleaned up a confusing if statement a6dee5e37980106cfec2706fc1ab40d762b1a0d3 Ben Burkert ben@benburkert.com 758a19603ad276a6e95cbaed00bd6b9b4182f0eb Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/6a54e6c391aa01a9223d2b85772c539fa078214b 6a54e6c391aa01a9223d2b85772c539fa078214b 2008-03-03T16:03:11-08:00 2008-03-03T16:03:11-08:00 moved rspec rake tasks into core. Added Merb.rakefiles, which is now used by Merb::Plugins.rakefiles. Changed Kernel#use_test to only load dependency arguments when Merb.env is nil or test. b09899c164266d93cbc809c7ea882a519ac3ebf1 Ben Burkert ben@benburkert.com 451c7857437a4084c00e5057fb6efd2092290342 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/758a19603ad276a6e95cbaed00bd6b9b4182f0eb 758a19603ad276a6e95cbaed00bd6b9b4182f0eb 2008-03-03T15:23:07-08:00 2008-03-03T15:23:07-08:00 do not load test framework unless Merb.env == 'test' cb8c87614cc74668b7d100af29a0165ded7d51ce Ezra Zygmuntowicz ez@engineyard.com 9cd5ae93ea7ffe886edb959162e3b45b23885fec Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/451c7857437a4084c00e5057fb6efd2092290342 451c7857437a4084c00e5057fb6efd2092290342 2008-03-03T15:08:28-08:00 2008-03-03T15:08:28-08:00 Use new Object.make_module to create the module instead of old hackish solution. 560a65df31c2ab6741db2c8f8a20052a96eae372 Yehuda Katz wycats@gmail.com ef0480aec9e5828387480b8f196956e6e6f844b5 7e37e6779f3c64111ec7639f5aaf9095da3a8939 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/9cd5ae93ea7ffe886edb959162e3b45b23885fec 9cd5ae93ea7ffe886edb959162e3b45b23885fec 2008-03-03T14:02:52-08:00 2008-03-03T14:02:52-08:00 Merge branch 'master' of git@github.com:wycats/merb-core 8b8c1a06b5cb943f3a7f2e70bcbfe65b8cc1a138 Yehuda Katz wycats@gmail.com ace2bd2aa023b16abc70a83333ffff5e46c65908 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ef0480aec9e5828387480b8f196956e6e6f844b5 ef0480aec9e5828387480b8f196956e6e6f844b5 2008-03-03T14:02:31-08:00 2008-03-03T14:02:31-08:00 Don't clear our mimes previously defined. 6c5a6541245f15ac5a677097a686a4980eec5455 Yehuda Katz wycats@gmail.com 0ebd60030f2d8d5e4f50c0bf534172aaacc5c937 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/7e37e6779f3c64111ec7639f5aaf9095da3a8939 7e37e6779f3c64111ec7639f5aaf9095da3a8939 2008-03-03T13:40:15-08:00 2008-03-03T13:40:15-08:00 Fixed clean task deleting everything in the lib folder cf4f18dcc07b9b0e65119218306343ce51558760 Ben Burkert ben@benburkert.com ace2bd2aa023b16abc70a83333ffff5e46c65908 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-core/commit/0ebd60030f2d8d5e4f50c0bf534172aaacc5c937 0ebd60030f2d8d5e4f50c0bf534172aaacc5c937 2008-03-03T12:48:51-08:00 2008-03-03T12:48:51-08:00 Kernel#dependency requires gems/files in a before_app_loads block. 9cb7ca47af9329db802db498a54c17713ba9e3a7 Ben Burkert ben@benburkert.com 9585b19c5b49b02d05a44db457bcbf1f64a28a36 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/ace2bd2aa023b16abc70a83333ffff5e46c65908 ace2bd2aa023b16abc70a83333ffff5e46c65908 2008-03-03T12:27:10-08:00 2008-03-03T12:27:10-08:00 Move dependency loading after framework and look for framework.rb aa9ba306cbf8b9c83124f8afb7194877d8561d90 Yehuda Katz wycats@gmail.com ee58c6c141d422f8bc7a7d596fa89071b0c63f8f Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/9585b19c5b49b02d05a44db457bcbf1f64a28a36 9585b19c5b49b02d05a44db457bcbf1f64a28a36 2008-03-02T21:04:09-08:00 2008-03-02T21:04:09-08:00 remove vestigal rbx dir 76aacf41ec432fda82a40f15d4fa4874a1c6c81f Ezra Zygmuntowicz ez@engineyard.com 5cfe8ec4d6cf636fb9a11318110a7f7e49cf4a98 Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-core/commit/ee58c6c141d422f8bc7a7d596fa89071b0c63f8f ee58c6c141d422f8bc7a7d596fa89071b0c63f8f 2008-03-01T19:22:28-08:00 2008-03-01T19:22:28-08:00 Touching up a few things 41a5549cc4aa34f0718ff6600e5f02ecbb5a64a6 Ezra Zygmuntowicz ez@engineyard.com