lib/generators/templates/application/merb_stack/config/dependencies.rb in merb-gen-1.0.8.1 vs lib/generators/templates/application/merb_stack/config/dependencies.rb in merb-gen-1.0.9
- old
+ new
@@ -1,16 +1,16 @@
# dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
merb_gems_version = "<%= merb_gems_version %>"
dm_gems_version = "<%= dm_gems_version %>"
-do_gems_version = "0.9.10.1"
+do_gems_version = "<%= do_gems_version %>"
# For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
dependency "merb-core", merb_gems_version
dependency "merb-action-args", merb_gems_version
dependency "merb-assets", merb_gems_version
dependency("merb-cache", merb_gems_version) do
Merb::Cache.setup do
- register(Merb::Cache::FileStore)
+ register(Merb::Cache::FileStore) unless Merb.cache
end
end
dependency "merb-helpers", merb_gems_version
dependency "merb-mailer", merb_gems_version
dependency "merb-slices", merb_gems_version
\ No newline at end of file