From fceb0e8ba174caa70f17c89460f1b6461320f733 Mon Sep 17 00:00:00 2001
From: Ancor Gonzalez Sosa <ancor@suse.de>
Date: Tue, 11 Mar 2014 10:29:15 +0000
Subject: [PATCH] Temporary disable capistrano for initial ruby 2.1 deploy

---
 Gemfile      |  2 +-
 Gemfile.lock | 15 ---------------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/Gemfile b/Gemfile
index fc98248b8..fb17a5f8e 100644
--- a/Gemfile
+++ b/Gemfile
@@ -70,4 +70,4 @@ group :test do
   gem 'webmock'
 end
 
-gem 'capistrano', '~> 2.13'
+# gem 'capistrano', '~> 2.13'
diff --git a/Gemfile.lock b/Gemfile.lock
index 89ad8b514..d019e437c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -29,12 +29,6 @@ GEM
     arel (4.0.1)
     atomic (1.1.14)
     builder (3.1.4)
-    capistrano (2.14.2)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
     capybara (2.2.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -66,7 +60,6 @@ GEM
       text
     gettext_i18n_rails (1.0.3)
       fast_gettext (>= 0.4.8)
-    highline (1.6.20)
     hike (1.2.3)
     hoptoad_notifier (2.4.11)
       activesupport
@@ -86,13 +79,6 @@ GEM
     mini_portile (0.5.2)
     minitest (4.7.5)
     multi_json (1.8.4)
-    net-scp (1.1.2)
-      net-ssh (>= 2.6.5)
-    net-sftp (2.1.2)
-      net-ssh (>= 2.6.5)
-    net-ssh (2.8.0)
-    net-ssh-gateway (1.2.0)
-      net-ssh (>= 2.6.5)
     nokogiri (1.6.1)
       mini_portile (~> 0.5.0)
     pkg-config (1.1.5)
@@ -167,7 +153,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  capistrano (~> 2.13)
   capybara
   compass-rails
   dalli