Merge

couchbaselabs · Sep 20, 2011 · 278be6e · 278be6e
2 parents 1648d02 + 0bd01f7
commit 278be6e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,6 +18,7 @@ end
 # Development / Test only.
 group :development, :test do
   gem 'ruby-debug'
+  gem 'foreman'
 end
 group :test do
   gem 'turn', :require => false

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -51,6 +51,9 @@ GEM
     erubis (2.7.0)
     execjs (1.2.4)
       multi_json (~> 1.0)
+    foreman (0.22.0)
+      term-ansicolor (~> 1.0.5)
+      thor (>= 0.13.6)
     hike (1.2.1)
     i18n (0.6.0)
     jquery-rails (1.0.13)
@@ -105,6 +108,7 @@ GEM
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (!= 1.3.0, ~> 1.1)
+    term-ansicolor (1.0.6)
     therubyracer-heroku (0.8.1.pre3)
     thor (0.14.6)
     tilt (1.3.3)
@@ -128,6 +132,7 @@ PLATFORMS
 DEPENDENCIES
   coffee-rails (~> 3.1.0)
   couchbase-ruby-client
+  foreman
   jquery-rails
   rails (= 3.1.0)
   ruby-debug