0a11674f2a136e9867d521508d2165828cd0f6d5 b152afa28a0c817c7f89d4056fcf26747ed080b2 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/0ae3b0c28db7d0853eabb25a53038b8afdf1c970 0ae3b0c28db7d0853eabb25a53038b8afdf1c970

2008-10-13T13:18:53-07:00

Merge branch 'active' of git@github.com:wycats/merb into active 8f9538accf83a937211b0100701e53471c99af0b Matt Aimonetti mattaimonetti@gmail.com 175518557d4f034f324a3cfa36b0a0f6210616fb Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/0a11674f2a136e9867d521508d2165828cd0f6d5 0a11674f2a136e9867d521508d2165828cd0f6d5

2008-10-13T13:18:06-07:00

fixed specs after changing the generated specs to requests specs 26ffc01c9e4ea6ca592543b9e2500317c29c7a3a Matt Aimonetti mattaimonetti@gmail.com 175518557d4f034f324a3cfa36b0a0f6210616fb Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/b152afa28a0c817c7f89d4056fcf26747ed080b2 b152afa28a0c817c7f89d4056fcf26747ed080b2

2008-10-13T13:13:56-07:00

Let's not have specs that say 'we should have specs' 2dced7f65528918ad4bd213b126840d28735c773 Yehuda Katz wycats@gmail.com 211834c117f09e86daddc4e4e1be9959b20b3e84 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/175518557d4f034f324a3cfa36b0a0f6210616fb 175518557d4f034f324a3cfa36b0a0f6210616fb

2008-10-13T13:07:21-07:00

Make more messages verbose only 5a523fd4ea6d241f3d7dc52daf2661f6f810edd2 Yehuda Katz wycats@gmail.com 6603f489e3bd6908af49caee276b5e363fca3bb9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/211834c117f09e86daddc4e4e1be9959b20b3e84 211834c117f09e86daddc4e4e1be9959b20b3e84

2008-10-13T13:07:09-07:00

Remove useless message 4c6b8c3d8c3a8d2369c1e8bd3cfe7abfff6e416f Yehuda Katz wycats@gmail.com 40c98ea19ff4122ac97926908a521b486f6f47b8 062723aadceeeba88ebf7c0df9a772234723f8fd Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/6603f489e3bd6908af49caee276b5e363fca3bb9 6603f489e3bd6908af49caee276b5e363fca3bb9

2008-10-13T13:01:30-07:00

Merge branch 'active' of git@github.com:wycats/merb into active 28138e469724abeb7799af17b912481e5fe95576 Yehuda Katz wycats@gmail.com 975f3c7f206e46186777d068ecbf7091ffd4744e Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/40c98ea19ff4122ac97926908a521b486f6f47b8 40c98ea19ff4122ac97926908a521b486f6f47b8

2008-10-13T13:01:15-07:00

Change .debug to .verbose\! 089dfd3c98ff058109e2b91a03d42ebbe6092e6d Yehuda Katz wycats@gmail.com 4337e30f0d450ee2b176353b6ad2f67ed535b56d 975f3c7f206e46186777d068ecbf7091ffd4744e Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/062723aadceeeba88ebf7c0df9a772234723f8fd 062723aadceeeba88ebf7c0df9a772234723f8fd

2008-10-13T12:54:40-07:00

Merge branch 'active' of git@github.com:wycats/merb into active 3b0b2af9741cc829d98881421b3aea9e74abfa1d Matt Aimonetti mattaimonetti@gmail.com 74d06903479288f5e14bb5b9cdf53380107cb414 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/4337e30f0d450ee2b176353b6ad2f67ed535b56d 4337e30f0d450ee2b176353b6ad2f67ed535b56d

2008-10-13T12:53:44-07:00

made the resource template use action args aa5520a1147725fc5e5686168651a79b587ff5a4 Matt Aimonetti mattaimonetti@gmail.com e4acba89e1fae6fdf703855dd19f24b0fcf056e1 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/975f3c7f206e46186777d068ecbf7091ffd4744e 975f3c7f206e46186777d068ecbf7091ffd4744e

2008-10-13T12:50:08-07:00

Don't show loading unless verbose 35ba1e11987a19800316affed4793ce2be71fd9e Yehuda Katz wycats@gmail.com 74d06903479288f5e14bb5b9cdf53380107cb414 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/e4acba89e1fae6fdf703855dd19f24b0fcf056e1 e4acba89e1fae6fdf703855dd19f24b0fcf056e1

2008-10-13T12:49:52-07:00

Some merge issue happened 429d7146f76cd5d6485cc7b3a24f5f99d360af96 Yehuda Katz wycats@gmail.com 4561603b19f05ff89385777065c91b0f53013f2f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/74d06903479288f5e14bb5b9cdf53380107cb414 74d06903479288f5e14bb5b9cdf53380107cb414

2008-10-13T12:40:02-07:00

merb-gen should not generate helper specs aa1bb769f4ed9dde23852c8e2477d9b9ccc3f9ba Yehuda Katz wycats@gmail.com 369b17327449df475b07287a8015e7bb042ed046 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/4561603b19f05ff89385777065c91b0f53013f2f 4561603b19f05ff89385777065c91b0f53013f2f

2008-10-13T12:28:56-07:00

Fixes a few bugs that were coming up when testing a new app; (1) Merb.logger is not available when looking for Merb; (2) rake db:migrate was relying on the outdated rake dm:db:migrate 33769da085f8f26e5f296622867d0765b731f280 Yehuda Katz wycats@gmail.com b18be83f6584d9c157bc693f171ead0e2e28026c Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/369b17327449df475b07287a8015e7bb042ed046 369b17327449df475b07287a8015e7bb042ed046

2008-10-13T11:49:54-07:00

changed the generated view/request specs to be pending e4d4d3be4c6c88c1e97e086c6c21d9ac2443e66e Matt Aimonetti mattaimonetti@gmail.com f01773a854ccebbfeab74e214243f9da8cf05cf9 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb/commit/b18be83f6584d9c157bc693f171ead0e2e28026c b18be83f6584d9c157bc693f171ead0e2e28026c

2008-10-13T10:51:20-07:00

Fixes the [BUG] again 1832d43501af6fa33c3ea9d6a7ef008664de4560 Yehuda Katz wycats@gmail.com a57480e9ac00cc39dd050a5598aedcae56912a8a Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/f01773a854ccebbfeab74e214243f9da8cf05cf9 f01773a854ccebbfeab74e214243f9da8cf05cf9

2008-10-13T10:24:20-07:00

Explicitly don't use a minigems executable wrapper for merb-gen 5c1dec4c7a001bd454132eec6409e70526855bbf Fabien Franzen info@atelierfabien.be 60eebd8b7dfa1653fbc9027d0362bd82e513a962 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/a57480e9ac00cc39dd050a5598aedcae56912a8a a57480e9ac00cc39dd050a5598aedcae56912a8a

2008-10-13T10:08:44-07:00

More fixes to Rakefile (templates) 2e7cc89ed7462181ac2d1911d348c9f65039d616 Fabien Franzen info@atelierfabien.be 36c604e19d74383eea99036220f464fdca7d470a Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/60eebd8b7dfa1653fbc9027d0362bd82e513a962 60eebd8b7dfa1653fbc9027d0362bd82e513a962

2008-10-13T09:35:47-07:00

Updated merb.thor to work with the new merb repo structure ab603930d843248e99803a1c0f26e6cf305268eb Fabien Franzen info@atelierfabien.be 2a6832331edc3a1a33c1e7df940124271a898155 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/36c604e19d74383eea99036220f464fdca7d470a 36c604e19d74383eea99036220f464fdca7d470a

2008-10-13T09:33:16-07:00

Some minor touchups to merb-auth f7a13b321b828cd089c93c8388d7983a9360c7d2 Fabien Franzen info@atelierfabien.be 770ff217359ae25b31d5c62a8de64205650ecd07 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/2a6832331edc3a1a33c1e7df940124271a898155 2a6832331edc3a1a33c1e7df940124271a898155

2008-10-13T09:13:37-07:00

Rakefile now properly supports install/uninstall (core|more|all) 93594e803499b0fe3b1431ef79b42eab17db9d78 Fabien Franzen info@atelierfabien.be 6d00c10209f730ae65701e3d2d2f788a72979eec Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/770ff217359ae25b31d5c62a8de64205650ecd07 770ff217359ae25b31d5c62a8de64205650ecd07

2008-10-13T08:24:04-07:00

Removed reloading/reload_spec.rb - looks like it's become irrelevant cc50bc22d0c0f8f0eeaec61cb0edc93aaef20ec2 Fabien Franzen info@atelierfabien.be 4b56fa2b8b692bf84cfd2556e457a999296142c8 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/6d00c10209f730ae65701e3d2d2f788a72979eec 6d00c10209f730ae65701e3d2d2f788a72979eec

2008-10-13T08:20:36-07:00

Fixed situation where Merb.log_stream would take Merb.testing? into account just once 9d9773e097775e031341f70f7afb57e459705ec5 Fabien Franzen info@atelierfabien.be b195a140bbbd03005605e6781703da23a42a5613 61b386aeeb5aa9010f29a69ea3ff972522af90c6 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/4b56fa2b8b692bf84cfd2556e457a999296142c8 4b56fa2b8b692bf84cfd2556e457a999296142c8

2008-10-13T06:58:57-07:00

Resolved merge conflict 57092309e27a4a1857dff83d7325d8fd14dd3cad Fabien Franzen info@atelierfabien.be 416879f3bc60e73793f9c6fab83571a6f883b7a7 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb/commit/b195a140bbbd03005605e6781703da23a42a5613 b195a140bbbd03005605e6781703da23a42a5613

2008-10-13T06:55:39-07:00

Some fine-tuning in merb-core.rb 48ab0a3298ed1dd5d4afb97fafc1c5852abd933a Fabien Franzen info@atelierfabien.be 1638311bc329d586216bbbda9c5f6c7f34fb8b49 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/61b386aeeb5aa9010f29a69ea3ff972522af90c6 61b386aeeb5aa9010f29a69ea3ff972522af90c6

2008-10-13T04:30:28-07:00

added param protection to the full stack deps after fixing the plugin a5e6171d2ad76d0291a44cd806da36b1a03f2c07 Matt Aimonetti mattaimonetti@gmail.com e575a13cad826d291265c68f9e6c8761b832e67a Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/1638311bc329d586216bbbda9c5f6c7f34fb8b49 1638311bc329d586216bbbda9c5f6c7f34fb8b49

2008-10-13T03:44:44-07:00

fixed a typo breaking the deps 593c9cd3b2aed1a6fa90462c2c22cac88ced77b4 Matt Aimonetti mattaimonetti@gmail.com b3676b609a67944c458194539011522d9a7a6166 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/e575a13cad826d291265c68f9e6c8761b832e67a e575a13cad826d291265c68f9e6c8761b832e67a

2008-10-13T03:42:14-07:00

fixed slice generator outside an app dir 6e7da201829c604b351fa5f00c533c473de32ea1 Matt Aimonetti mattaimonetti@gmail.com aadc42424ca5830007c0d3ea21729f4375f3530e Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/b3676b609a67944c458194539011522d9a7a6166 b3676b609a67944c458194539011522d9a7a6166

2008-10-13T03:34:13-07:00

updated thor dependency d3683e9b26848d2198a2d65e9a344dae6312957e Matt Aimonetti mattaimonetti@gmail.com 553581cabbbaf2698f3a2faf77204ff75dc92744 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/aadc42424ca5830007c0d3ea21729f4375f3530e aadc42424ca5830007c0d3ea21729f4375f3530e

2008-10-13T03:30:48-07:00

commented out the failing merb_gen generator specs, waiting for antares to fix that 7729cdb628c2e6b0317701ebb712d2e59796aca3 Matt Aimonetti mattaimonetti@gmail.com 54dd9335c20384685d2bdce7ad8824f3b8c59878 de81f3dcb662cbcf06de75bdbd27f554050d9ac9 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb/commit/553581cabbbaf2698f3a2faf77204ff75dc92744 553581cabbbaf2698f3a2faf77204ff75dc92744

2008-10-13T03:23:51-07:00

Merge branch 'active' of git@github.com:wycats/merb into active 945c64f90215e69de6486f206867e1dd1042a9f3 Matt Aimonetti mattaimonetti@gmail.com