merb 1.0.7

new bundler tasks
jackdempsey · Dec 30, 2008 · f510e9c · f510e9c
1 parent 3f9b5a2
commit f510e9c
Show file tree

Hide file tree

Showing 9 changed files with 509 additions and 2,023 deletions.
diff --git a/.gitignore b/.gitignore
@@ -15,4 +15,9 @@ schema/*.db
 src/*
 .hgignore
 .hg/*
-.svn/*
+.svn/*
+gems/gems/*/
+gems/specifications/*
+!gems/gems/thor*/
+!gems/specifications/thor*
+merb_profile_results
diff --git a/config/dependencies.rb b/config/dependencies.rb
@@ -1,6 +1,6 @@
 # dependencies are generated using a strict version, don't forget to edit the dependency versions when upgrading.
-merb_gems_version = "1.0"
-dm_gems_version   = "0.9.6"
+merb_gems_version = "1.0.7"
+dm_gems_version   = "0.9.8"
 
 # For more information about each component, please read http://wiki.merbivore.com/faqs/merb_components
 dependency "merb-action-args", merb_gems_version