fea472686b12a0f5da9c2eb1dfab4266836d2fbf Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/088f956443e93d50d1b740e71b9454099efec73f 088f956443e93d50d1b740e71b9454099efec73f 2008-07-24T22:30:25-07:00 2008-07-24T22:30:25-07:00 Adding views for the new partial collection counter specs 55a56e74529705e373c76fbd075053c32cf26185 Carl Lerche carllerche@mac.com 7cb2d479de25ea46661584b0b636810b0def0f01 Carl Lerche carllerche@mac.com http://github.com/wycats/merb-core/commit/fea472686b12a0f5da9c2eb1dfab4266836d2fbf fea472686b12a0f5da9c2eb1dfab4266836d2fbf 2008-07-24T22:29:40-07:00 2008-07-24T22:29:40-07:00 Adding the current index and collection size for partials rendered with a collection 4c7149fdc95d03de5f5d2945854329f5a39b3b06 Carl Lerche carllerche@mac.com 901ec3fa2617ffe39f70347ac749a1a64f261903 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/7cb2d479de25ea46661584b0b636810b0def0f01 7cb2d479de25ea46661584b0b636810b0def0f01 2008-07-23T17:26:39-07:00 2008-07-23T17:26:39-07:00 If someone can figure out why this is already defined, please let me know 496e3a357f4241ac94faf3c561603fb47de1a168 Yehuda Katz wycats@gmail.com bfbb9e0744465d1ee9cfbd8aab7e7c68a5c098d2 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/901ec3fa2617ffe39f70347ac749a1a64f261903 901ec3fa2617ffe39f70347ac749a1a64f261903 2008-07-23T17:12:21-07:00 2008-07-23T17:12:21-07:00 Yeah... not a good idea 2bcb8203752cc4f1f5b8ccdd7eb406104e25e837 Yehuda Katz wycats@gmail.com dea5b6914daa668e01ded198281441796925a3d5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/bfbb9e0744465d1ee9cfbd8aab7e7c68a5c098d2 bfbb9e0744465d1ee9cfbd8aab7e7c68a5c098d2 2008-07-23T17:07:47-07:00 2008-07-23T17:07:47-07:00 ADd push_paths to the load path. be888cd5be397fce02efafb8176414a1da3e273b Yehuda Katz wycats@gmail.com 04d38da798cda4217dcd3b1b29c9043e873b6ad0 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/dea5b6914daa668e01ded198281441796925a3d5 dea5b6914daa668e01ded198281441796925a3d5 2008-07-23T16:30:23-07:00 2008-07-23T16:30:23-07:00 another tiny tweak 4e7fc991608e3c910f79b960b97bc69d07b11e0a Yehuda Katz wycats@gmail.com a869557e886ed1aa35e9bd54882a7e03684629a9 0a3d655be79657b99549a5522a13847119c95f4c Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/04d38da798cda4217dcd3b1b29c9043e873b6ad0 04d38da798cda4217dcd3b1b29c9043e873b6ad0 2008-07-23T15:37:58-07:00 2008-07-23T15:37:58-07:00 Merge branch 'master' of git@github.com:wycats/merb-core 02a46e1ac765cad8bb8e3526c26b5dafec36de8c Yehuda Katz wycats@gmail.com 8a2940914437a47af60d927dfad427dc7594a5e5 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/a869557e886ed1aa35e9bd54882a7e03684629a9 a869557e886ed1aa35e9bd54882a7e03684629a9 2008-07-23T15:37:00-07:00 2008-07-23T15:37:00-07:00 Fixes open IO issue f6c6b8dce022c040c475ec9bffe62e022c744020 Yehuda Katz wycats@gmail.com ef1f50a3737db3b4234b00e8c0e50d4707a542e1 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/0a3d655be79657b99549a5522a13847119c95f4c 0a3d655be79657b99549a5522a13847119c95f4c 2008-07-21T17:33:21-07:00 2008-07-21T17:33:21-07:00 Move to merb-extlib is almost there. c534fcd382999671e8d0c8642bcf1665ea1db903 Michael S. Klishin michael@novemberain.com 4bf449725540b0f51e8f116d7742568d95726f02 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/ef1f50a3737db3b4234b00e8c0e50d4707a542e1 ef1f50a3737db3b4234b00e8c0e50d4707a542e1 2008-07-21T17:17:04-07:00 2008-07-21T17:17:04-07:00 Output a warning about merb-extlib if it can't be loaded. 4d0d7c8c4c96ba68beb85982ee8cbb292afa8eed Michael S. Klishin michael@novemberain.com 8a2940914437a47af60d927dfad427dc7594a5e5 cffcacbb528ab20a8cab725434a573da17c16dde Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/4bf449725540b0f51e8f116d7742568d95726f02 4bf449725540b0f51e8f116d7742568d95726f02 2008-07-21T15:30:28-07:00 2008-07-21T15:30:28-07:00 Merge branch 'generator_inclusion' into new-merb-gen * generator_inclusion: added add_generators, which allows plugins to load their own generator in the same way as rakefiles 10df5e71e19d4007b9e6024636c2d80b127a88c8 Michael S. Klishin michael@novemberain.com 237c115c4a2be9f7e9b24de0224c494dbe6e6336 defdabd8df298863a2704d66c6d1054058a9d84f Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-core/commit/8a2940914437a47af60d927dfad427dc7594a5e5 8a2940914437a47af60d927dfad427dc7594a5e5 2008-07-21T13:44:15-07:00 2008-07-21T13:44:15-07:00 Resolved conflict. 7bc8693468dc29362facec77737f7398d97731e0 Yehuda Katz wycats@gmail.com c63375986e5111b00cd66c9dc608f216d5069d15 Wayne E. Seguin wayneeseguin@gmail.com http://github.com/wycats/merb-core/commit/defdabd8df298863a2704d66c6d1054058a9d84f defdabd8df298863a2704d66c6d1054058a9d84f 2008-07-21T12:03:27-07:00 2008-07-21T12:03:27-07:00 Applying patch to allow use of thin_turbo adapter. Thanks dkubb! 6a0cc969f64d66c8fee1682ca55bb2572621758b Wayne E. Seguin wayneeseguin@gmail.com 3aff23978752336b0522e030664135e51281a1dc c63375986e5111b00cd66c9dc608f216d5069d15 Jonas Nicklas jonas.nicklas@gmail.com http://github.com/wycats/merb-core/commit/cffcacbb528ab20a8cab725434a573da17c16dde cffcacbb528ab20a8cab725434a573da17c16dde 2008-07-20T14:32:06-07:00 2008-07-20T14:32:06-07:00 Merge commit 'origin/master' into generator_inclusion 3d95df04179a48a314d8219a1413ae323affd20b Jonas Nicklas jonas.nicklas@gmail.com c1b4cbcd1c85674551d4bc5fa068611a75e9a5de Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/237c115c4a2be9f7e9b24de0224c494dbe6e6336 237c115c4a2be9f7e9b24de0224c494dbe6e6336 2008-07-20T14:08:04-07:00 2008-07-20T14:08:04-07:00 Did I really commit that? 2bca145c1b1023250da9c91e57b037486ae852dc Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 047a5fe76be7525750b605364c02139f04505b27 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/c63375986e5111b00cd66c9dc608f216d5069d15 c63375986e5111b00cd66c9dc608f216d5069d15 2008-07-20T11:01:15-07:00 2008-07-20T11:01:15-07:00 Use :info as default log level for now: people wonder "where the output is gone". bc052da325e0817f97c5d465a39f9ee0335ba05d Michael S. Klishin michael@novemberain.com bf37243fc8aa4eee1cc41f2504f3261f4dc03b46 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/047a5fe76be7525750b605364c02139f04505b27 047a5fe76be7525750b605364c02139f04505b27 2008-07-20T10:02:31-07:00 2008-07-20T10:02:31-07:00 Make sure default config has log level of error so template inlining bootloader won't dump everything to the tty. ce4a512ad69390be1b59d5cd991dea3ccb8de24f Michael S. Klishin michael@novemberain.com c1b4cbcd1c85674551d4bc5fa068611a75e9a5de Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/bf37243fc8aa4eee1cc41f2504f3261f4dc03b46 bf37243fc8aa4eee1cc41f2504f3261f4dc03b46 2008-07-20T07:18:15-07:00 2008-07-20T07:18:15-07:00 Do not reference to old merb.yml in doc. d4e42a20b9608e1d9de218a53e4512e8e79ad1c5 Michael S. Klishin michael@novemberain.com c63289183238fd91be30a57405379918f8e65d56 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/c1b4cbcd1c85674551d4bc5fa068611a75e9a5de c1b4cbcd1c85674551d4bc5fa068611a75e9a5de 2008-07-19T19:47:41-07:00 2008-07-19T19:47:41-07:00 whoops... dup 2879fa9410fa83ac0bbf87358897ee0d872b9fab Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 509851b02f2bcb7936f3a122b499e69253280ce5 03ab9c4a21767d8e16b277eb656642bcc89dae37 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/c63289183238fd91be30a57405379918f8e65d56 c63289183238fd91be30a57405379918f8e65d56 2008-07-19T19:45:50-07:00 2008-07-19T19:45:50-07:00 Fix conflict. ec5694b8feefc3e23f94695d2ccea2eaee492a3c Yehuda Katz wycats@yehuda-katzs-macbook-pro.local c019974cb103ca21722fe18c12872c50669a2ea3 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local http://github.com/wycats/merb-core/commit/509851b02f2bcb7936f3a122b499e69253280ce5 509851b02f2bcb7936f3a122b499e69253280ce5 2008-07-19T19:44:00-07:00 2008-07-19T19:44:00-07:00 Add support for argument capture and fix $DEBUG bootloader stuff [#390 state:resolved] b39ac3003c130aacf1eab8fa38d585fdc3f01e84 Yehuda Katz wycats@yehuda-katzs-macbook-pro.local 74541523f1078d356a486804ca3a4eb06506ca7f Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/03ab9c4a21767d8e16b277eb656642bcc89dae37 03ab9c4a21767d8e16b277eb656642bcc89dae37 2008-07-19T19:12:59-07:00 2008-07-19T19:12:59-07:00 Ignore temp Emacs files. 4008fcc26219488ca12d159f49e952967e20ff01 Michael S. Klishin michael@novemberain.com eb6e1562c9dae05519b9724a52a5c2e835912c54 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/74541523f1078d356a486804ca3a4eb06506ca7f 74541523f1078d356a486804ca3a4eb06506ca7f 2008-07-19T19:11:18-07:00 2008-07-19T19:11:18-07:00 Generate tags only for lib. 8fd9648977aed6fa07301adf564016af1d062fa5 Michael S. Klishin michael@novemberain.com 34c74cd715bfa156ef9c4f6c13b5aeca9bc24512 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/eb6e1562c9dae05519b9724a52a5c2e835912c54 eb6e1562c9dae05519b9724a52a5c2e835912c54 2008-07-19T17:16:41-07:00 2008-07-19T17:16:41-07:00 Adds Rake tasks to generate Emacs tags. 18b72088e7b35b4d79d89d253b6fdbd5dd0f7922 Michael S. Klishin michael@novemberain.com fd71f5c9b1454ee6f8f41e473e00fc3731cc485a Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/34c74cd715bfa156ef9c4f6c13b5aeca9bc24512 34c74cd715bfa156ef9c4f6c13b5aeca9bc24512 2008-07-19T16:59:01-07:00 2008-07-19T16:59:01-07:00 Touch RDoc of LoadClasses bootloder. b6e498a78c54183e2d9a00ccfda4142326367672 Michael S. Klishin michael@novemberain.com b750ae02e5011d4af8392b5a365c1a7cc08f003a Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/fd71f5c9b1454ee6f8f41e473e00fc3731cc485a fd71f5c9b1454ee6f8f41e473e00fc3731cc485a 2008-07-19T15:26:41-07:00 2008-07-19T15:26:41-07:00 LoadClasses#remove_file => LoadClasses#remove_classes_in_file. 676d93580c2b74d2aa785c931263aeb7bc3b5aa9 Michael S. Klishin michael@novemberain.com cc0a0a080b5587527903b347e75c8586871afeda Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/b750ae02e5011d4af8392b5a365c1a7cc08f003a b750ae02e5011d4af8392b5a365c1a7cc08f003a 2008-07-17T18:49:51-07:00 2008-07-17T18:49:51-07:00 Output extra information on boot when verbose config option is given from command line or $DEBUG is set to true. 7ac613261a3f9de86dcfa4b579c583e9ab41fb9f Michael S. Klishin michael@novemberain.com 298c17e882b708a70e9f09475c022387d33d1e9c Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/cc0a0a080b5587527903b347e75c8586871afeda cc0a0a080b5587527903b347e75c8586871afeda 2008-07-17T18:30:20-07:00 2008-07-17T18:30:20-07:00 Make Logger bootloader print meaningful warning when RubyGems is outdated. ec9401e2bdcd2bf8cf931ed5c08e2ae17db32037 Michael S. Klishin michael@novemberain.com 9933decf13aab6be1af35bcc42d63d12a2756096 Carl Lerche carl@splendificent.com http://github.com/wycats/merb-core/commit/298c17e882b708a70e9f09475c022387d33d1e9c 298c17e882b708a70e9f09475c022387d33d1e9c 2008-07-17T18:02:01-07:00 2008-07-04T00:56:15-07:00 capture_erb correctly passes arguments to the block again Signed-off-by: Michael S. Klishin <michael@novemberain.com> babf8479810394cf66daae3e6c17367e47ab0032 Michael S. Klishin michael@novemberain.com c019974cb103ca21722fe18c12872c50669a2ea3 Michael S. Klishin michael@novemberain.com http://github.com/wycats/merb-core/commit/9933decf13aab6be1af35bcc42d63d12a2756096 9933decf13aab6be1af35bcc42d63d12a2756096 2008-07-17T14:50:10-07:00 2008-07-17T14:50:02-07:00 Let world know what this delete vs. destroy thing is all about. 6ac1d885eb4b780c9d8684aa00c2816796188abd Michael S. Klishin michael@novemberain.com