@@ -48,8 +48,6 @@ use_test :rspec, "merb_stories" # gem "archive-tar-minitar" dependencies "merb_helpers" -dependencies "merb-assets" -dependencies "merb-cache" dependency "merb_helpers" dependency "merb-assets" dependency "merb-cache" @@ -104,5 +102,6 @@ end Merb::Plugins.config[:merb_cache] = { :cache_html_directory => Merb.dir_for(:public) / "cache", :store => "file", - :cache_directory => Merb.root_path("tmp/cache") + :cache_directory => Merb.root_path("tmp/cache"), + :disable => "development" } config/init.rb 7dfa4de82b570883c05f88377d3d2e370a129ab4 b7014058e9962efa8225c6d9a5f19334c39a6b3d Alexander Flatter flatter@alexander-flatters-macbook-pro.local http://github.com/aflatter/feather/commit/d97f31fa3ed591d3c98008bff4cf586cab8293da d97f31fa3ed591d3c98008bff4cf586cab8293da 2008-06-27T04:00:41-07:00 2008-06-27T04:00:41-07:00 Merge branch 'master' of git@github.com:aflatter/feather e80eb9d2cc32a0900551736522b96277945f71e0 Alexander Flatter flatter@alexander-flatters-macbook-pro.local