From a1a469da036793fd8870f1dab043517eb72d636c Mon Sep 17 00:00:00 2001
From: wvengen <dev-voko@willem.engen.nl>
Date: Thu, 6 Jun 2013 14:54:54 +0200
Subject: [PATCH] do not fail when common_deploy is not installed

---
 Gemfile      |  2 +-
 Gemfile.lock | 22 ----------------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/Gemfile b/Gemfile
index e794d5a8..27656419 100644
--- a/Gemfile
+++ b/Gemfile
@@ -64,5 +64,5 @@ group :development do
   # Deploy with Capistrano
   gem 'capistrano', '2.13.5'
   gem 'capistrano-ext'
-  gem 'common_deploy', require: false, path: '../../common_deploy' #git: 'git://github.com/fsmanuel/common_deploy.git'
+  #gem 'common_deploy', require: false, path: '../../common_deploy' # pending foodcoops/foodsoft#34,  git: 'git://github.com/fsmanuel/common_deploy.git'
 end
diff --git a/Gemfile.lock b/Gemfile.lock
index 447cb723..15fcef07 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -18,15 +18,6 @@ GIT
     acts_as_versioned (0.6.0)
       activerecord (>= 3.0.9)
 
-PATH
-  remote: ../../common_deploy
-  specs:
-    common_deploy (0.0.1)
-      capistrano (>= 2.13.5)
-      capistrano-ext
-      capistrano-resque (~> 0.1.0)
-      rvm-capistrano
-
 GEM
   remote: https://rubygems.org/
   specs:
@@ -76,10 +67,6 @@ GEM
       net-ssh-gateway (>= 1.1.0)
     capistrano-ext (1.2.1)
       capistrano (>= 1.0.0)
-    capistrano-resque (0.1.0)
-      capistrano
-      resque
-      resque-scheduler
     chronic (0.9.0)
     client_side_validations (3.1.4)
     coderay (1.0.8)
@@ -206,16 +193,8 @@ GEM
       redis-namespace (~> 1.2)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    resque-scheduler (2.0.1)
-      redis (>= 2.0.1)
-      resque (>= 1.20.0)
-      rufus-scheduler
     ruby-prof (0.11.2)
     ruby-rc4 (0.1.5)
-    rufus-scheduler (2.0.19)
-      tzinfo (>= 0.3.23)
-    rvm-capistrano (1.3.0)
-      capistrano (>= 2.0.0)
     sass (3.2.1)
     sass-rails (3.2.5)
       railties (~> 3.2.0)
@@ -287,7 +266,6 @@ DEPENDENCIES
   capistrano-ext
   client_side_validations
   coffee-rails (~> 3.2.1)
-  common_deploy!
   daemons
   exception_notification
   haml-rails