8690d673201d6cff9019dc26291af773eafdb4a0 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/4f87aceb53318e5f9122577b6e646f6c139d1532 4f87aceb53318e5f9122577b6e646f6c139d1532

2008-05-05T02:37:39-07:00

Cache error with default content-type fixed. Closing #125 60bf5b2e7724935edb7dced8374068816d733a42 booss alex.boussinet@gmail.com 47d372f6a6f195974792a76554ccab41b324b2a9 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/8690d673201d6cff9019dc26291af773eafdb4a0 8690d673201d6cff9019dc26291af773eafdb4a0

2008-04-29T05:17:11-07:00

Cached page requests now respect the original content-type, fixing #116 39812c00c36a053cb789115923e5ac0cba2366db booss alex.boussinet@gmail.com d955257412574cb383ce8b300bb974665fdf1052 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/47d372f6a6f195974792a76554ccab41b324b2a9 47d372f6a6f195974792a76554ccab41b324b2a9

2008-04-26T11:41:25-07:00

Arguments to require_js and require_css methods are now kept seperate This enables correct :bundle and other argument handling for a set of assets. ce4495cc634b00dffe3c5612de799ce2b1c32530 Fabien Franzen info@atelierfabien.be 128efd8efa740f4e11ef0b2cc058a11af01c6542 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/d955257412574cb383ce8b300bb974665fdf1052 d955257412574cb383ce8b300bb974665fdf1052

2008-04-26T09:58:54-07:00

Properly handle assets urls with query strings in them Prevent the helper from adding .css to urls like /stylesheets/color.css?c=red b6b43fed7f49ac1434b0bc80599a8140a1319b56 Fabien Franzen info@atelierfabien.be 22cd0b1a96706561b9e8ba5952963f3f7ff9e4a7 booss alex.boussinet@gmail.com http://github.com/wycats/merb-more/commit/128efd8efa740f4e11ef0b2cc058a11af01c6542 128efd8efa740f4e11ef0b2cc058a11af01c6542

2008-04-25T01:23:24-07:00

Fixed "Page caching doesn't deactivate" closing #106 ee78f9a51913857f43fffc8b63bf7a14be068535 booss alex.boussinet@gmail.com 1dd5d5c2500fb627d421788d2aee56e7e944a8ec Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/22cd0b1a96706561b9e8ba5952963f3f7ff9e4a7 22cd0b1a96706561b9e8ba5952963f3f7ff9e4a7

2008-04-24T01:30:48-07:00

Small touchup regarding asset bundling 67f0d4e45ab55fe0b53dfa6ab3763e9d39930cf0 Fabien Franzen info@atelierfabien.be 3b43242f29389d533c618f53d512db6e95893962 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/1dd5d5c2500fb627d421788d2aee56e7e944a8ec 1dd5d5c2500fb627d421788d2aee56e7e944a8ec

2008-04-23T02:03:05-07:00

Made bundles stale for 60 seconds after modification/generation This way generating bundles won't be affected as much by starting multiple instances of your app. The first instance will probably regenerate the bundles once started. Other instances will follow in max. 60 seconds afterwards. Additionally, when writing the bundle an exclusive file lock is enforced. Fixed bug in include_require_* logic. 4188578a1c8228f91465bd4b659a7e69fa987315 Fabien Franzen info@atelierfabien.be 6757d1546065ea4fdf1c9d6ac0a53c6b612ca076 Fabien Franzen info@atelierfabien.be http://github.com/wycats/merb-more/commit/3b43242f29389d533c618f53d512db6e95893962 3b43242f29389d533c618f53d512db6e95893962

2008-04-23T01:10:53-07:00

Added bundling for require_js and require_css; track cached bundles in-memory The helper methods require_js and require_css now accept options to be merged with the include_required_js and include_required_css options. So :bundle and in the case of css :media options work as expected. A list of cached bundles is kept in memory instead of looking for an existing file (which can be out of date). The in-memory tracking of bundles implies that bundles are regenerated whenever the app (re)starts. In other words, at deployment too. (What about starting up multiple instances?) 6f19d8552ba97bc8c175a338ea2c9452c538188c Fabien Franzen info@atelierfabien.be 0af191cbf8eaeb7f3997c019c519bfeea95e7363 Michael D. Ivey ivey@gweezlebur.com http://github.com/wycats/merb-more/commit/6757d1546065ea4fdf1c9d6ac0a53c6b612ca076 6757d1546065ea4fdf1c9d6ac0a53c6b612ca076

2008-04-22T22:13:32-07:00

2008-04-22T22:12:59-07:00

merb-mailer absolute_url convenience method thanks mde: Mimics the behavior of absolute_url in AbstractController, using @base_controller.request. Useful to display the host name in the URLs in signup-confirmations for Merbful Auth. e24bd45db5b1bd489d4072272b3582c15926fefb Michael D. Ivey ivey@gweezlebur.com 7a83b1a0b6b60d4500acda0873c1a85a9102f092 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/0af191cbf8eaeb7f3997c019c519bfeea95e7363 0af191cbf8eaeb7f3997c019c519bfeea95e7363

2008-04-22T12:17:06-07:00

added default file logging in production mode 3d58aa6b9f4ceed3fa3ee9d10e35ffb9022e91c0 Matt Aimonetti mattaimonetti@gmail.com 9645de9130e80e109e2ae8c4a9422f02ad6e0ea1 1ec2bf0173b87cc55979c5a5afb7105466317a4a Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/7a83b1a0b6b60d4500acda0873c1a85a9102f092 7a83b1a0b6b60d4500acda0873c1a85a9102f092

2008-04-20T18:30:47-07:00

Merge branch 'master' of git@github.com:wycats/merb-more 0d40965913139f3cddee0539343b30beb0cfae24 Matt Aimonetti mattaimonetti@gmail.com e9378f505952030bb675394f3d4dc6279809a986 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/9645de9130e80e109e2ae8c4a9422f02ad6e0ea1 9645de9130e80e109e2ae8c4a9422f02ad6e0ea1

2008-04-20T18:28:11-07:00

merb-freezer now unshifts instead of pushes (vanpelt) e8470787c42bce86efdd2f09393cedd6ec1865e6 Matt Aimonetti mattaimonetti@gmail.com e9378f505952030bb675394f3d4dc6279809a986 Ben Burkert ben@benburkert.com http://github.com/wycats/merb-more/commit/1ec2bf0173b87cc55979c5a5afb7105466317a4a 1ec2bf0173b87cc55979c5a5afb7105466317a4a

2008-04-20T14:40:24-07:00

quieted missleading merb-gen warning when using rspec. Thanks ec! aae663867315fdf41a5675bf6517e48e6bfbabbe Ben Burkert ben@benburkert.com 174c62b2cfa74bf8724ff1e1fd67dc222933daf7 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/e9378f505952030bb675394f3d4dc6279809a986 e9378f505952030bb675394f3d4dc6279809a986

2008-04-20T10:22:35-07:00

updated documentation explaining the new % frozen-merb --merb-root argument 8ed5d681c7694557a01e5a2df3123e0f1b8b5806 Matt Aimonetti mattaimonetti@gmail.com a7d7082073edaca161ef069d2a2f62d9e7af9fbe Chris Van Pelt vanpelt@SnowWhite.local http://github.com/wycats/merb-more/commit/174c62b2cfa74bf8724ff1e1fd67dc222933daf7 174c62b2cfa74bf8724ff1e1fd67dc222933daf7

2008-04-20T10:19:02-07:00

2008-04-19T15:29:07-07:00

Makes frozen_merb bin work outside of the working directory (for god scripts for instance) by looking for the -m command line option c8c88ad3c315fe9fc5061ed2f9c039ed6b5cd6ff Matt Aimonetti mattaimonetti@gmail.com 688a4e61f28328700129386f6e9bcef80a0660a6 895191cf8c047fe28b38ff5bf3f807423b662f1a Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/a7d7082073edaca161ef069d2a2f62d9e7af9fbe a7d7082073edaca161ef069d2a2f62d9e7af9fbe

2008-04-17T23:02:39-07:00

Merge branch 'master' of git@github.com:wycats/merb-more into gem 3daffc5b07b8bd4ca9fab7456b3ff3361ca3bc6d Matt Aimonetti mattaimonetti@gmail.com 29e2eeebeb14a42cfb2cb7a8f25fa03b33e14d1a Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/688a4e61f28328700129386f6e9bcef80a0660a6 688a4e61f28328700129386f6e9bcef80a0660a6

2008-04-17T23:01:12-07:00

udpated documentation to reflect merb-freezer latest changes 8492d4612c872e8b61fb210f44aab8a9fe671ab6 Matt Aimonetti mattaimonetti@gmail.com 4aaf999438dc9aa558a2edfb263d1995f7a98a88 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/29e2eeebeb14a42cfb2cb7a8f25fa03b33e14d1a 29e2eeebeb14a42cfb2cb7a8f25fa03b33e14d1a

2008-04-17T22:45:27-07:00

fixed stupid submodule freezer 0840d86d2f5413468d164855e44809abaf314270 Matt Aimonetti mattaimonetti@gmail.com 7593cf8bc25896a527c154008af5f27596642625 Yehuda Katz wycats@gmail.com http://github.com/wycats/merb-more/commit/895191cf8c047fe28b38ff5bf3f807423b662f1a 895191cf8c047fe28b38ff5bf3f807423b662f1a

2008-04-17T19:17:48-07:00

Add dependencies for action-args and Haml 2bb67b9a235de9294b19e8c7b8276ecfc0b3ea4b Yehuda Katz wycats@gmail.com 7593cf8bc25896a527c154008af5f27596642625 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/4aaf999438dc9aa558a2edfb263d1995f7a98a88 4aaf999438dc9aa558a2edfb263d1995f7a98a88

2008-04-17T00:44:08-07:00

adding gem freezing, submodules might not work properly yet 087d55c261c546f36c46454de2f806a0248308a3 Matt Aimonetti mattaimonetti@gmail.com f57c6f2efb8d75d45a22003aa3f39aaad92260d8 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/7593cf8bc25896a527c154008af5f27596642625 7593cf8bc25896a527c154008af5f27596642625

2008-04-14T22:24:17-07:00

removed merb-core dependency so frozen-merb can work properly 6478ba47080c80d62af171b89979f824c0d79fff Matt Aimonetti mattaimonetti@gmail.com 7d62cb263f046bd4b708649a5b6c8be4cc19f354 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/f57c6f2efb8d75d45a22003aa3f39aaad92260d8 f57c6f2efb8d75d45a22003aa3f39aaad92260d8

2008-04-14T21:56:05-07:00

added simple message to let the user know what merb-core gem is being used 2c5c33ce5c041dcda4a5da2814ae92e9ed6841b9 Matt Aimonetti mattaimonetti@gmail.com d1dd14e38e2b34d7dddf9537f0b9aee6c1ee1601 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/7d62cb263f046bd4b708649a5b6c8be4cc19f354 7d62cb263f046bd4b708649a5b6c8be4cc19f354

2008-04-14T20:20:54-07:00

finally fixed the submodules freezer 525e96d09374107c544dcd10d96334ebc1fa49f3 Matt Aimonetti mattaimonetti@gmail.com 48b1072723b5d70035ae411b7eeb627290e15eec 1a247a5d31f37648a93124f8b1e6ba4df7cb5118 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/d1dd14e38e2b34d7dddf9537f0b9aee6c1ee1601 d1dd14e38e2b34d7dddf9537f0b9aee6c1ee1601

2008-04-13T22:04:15-07:00

Merge branch 'master' of git@github.com:wycats/merb-more 38d77f945a0c87340c430d0ced12896c4dad6938 Matt Aimonetti mattaimonetti@gmail.com ec0cf0384000d8bbf29238081aa87ac0334f7650 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/48b1072723b5d70035ae411b7eeb627290e15eec 48b1072723b5d70035ae411b7eeb627290e15eec

2008-04-13T22:03:38-07:00

started fixing the git submodules freezer 684a724e52076b876d3730ab83bde5f8fdc8364c Matt Aimonetti mattaimonetti@gmail.com 56e29c2b73850bbf69e9264a36da1ab209dc16e7 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/1a247a5d31f37648a93124f8b1e6ba4df7cb5118 1a247a5d31f37648a93124f8b1e6ba4df7cb5118

2008-04-12T08:18:42-07:00

Fix Rakefiles so they include the specs when generating the gems Also fixed the plugin generator to create the proper Rakefile. 814ac8d89f4b702e4c59a667cf5f7204527bfd67 Jonathan Younger jonathan@daikini.com ec0cf0384000d8bbf29238081aa87ac0334f7650 0f419067401aa0ee3b6c9eede46da3cf7bce753d Ezra Zygmuntowicz ez@engineyard.com http://github.com/wycats/merb-more/commit/56e29c2b73850bbf69e9264a36da1ab209dc16e7 56e29c2b73850bbf69e9264a36da1ab209dc16e7

2008-04-11T16:35:27-07:00

Merge branch 'ticket-103' of git://github.com/daikini/merb-more 990b6a50bdf6a2a652b51c375f6c6f9e6e9cd28c Ezra Zygmuntowicz ez@engineyard.com f2fdc8a2ae7a9f2d8abaaffe9ad0d10833dc5b71 Jonathan Younger jonathan@daikini.com http://github.com/wycats/merb-more/commit/0f419067401aa0ee3b6c9eede46da3cf7bce753d 0f419067401aa0ee3b6c9eede46da3cf7bce753d

2008-04-11T13:41:32-07:00

Fixes Merb::AssetsMixin errors from #103, also added specs 9b320d8219b7533eaf9510c19c010e4549db7818 Jonathan Younger jonathan@daikini.com 1b321585956debec1202effa837a129027643be7 f2fdc8a2ae7a9f2d8abaaffe9ad0d10833dc5b71 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/ec0cf0384000d8bbf29238081aa87ac0334f7650 ec0cf0384000d8bbf29238081aa87ac0334f7650

2008-04-11T11:27:00-07:00

Merge branch 'master' of git@github.com:wycats/merb-more 8bd5ed47519384458af6b285f74f49dc76c89490 Matt Aimonetti mattaimonetti@gmail.com 7b61b001488dbe5f5ad0b00dc48ad45d4e051590 Matt Aimonetti mattaimonetti@gmail.com http://github.com/wycats/merb-more/commit/1b321585956debec1202effa837a129027643be7 1b321585956debec1202effa837a129027643be7

2008-04-11T11:25:40-07:00

added merb-freezer to merb-more install rake task ddd663c0436f0198c2015b2635b803df650b99cc Matt Aimonetti mattaimonetti@gmail.com