We can't have dependencies on unpublished gems checked in; they break

deploy.

diff --git a/services/api/Gemfile b/services/api/Gemfile
index b1523b8973da4f3d410ae951766952f7e4e1f608..db011f15c3c55d9f9465e794264e2d8f448d183e 100644 (file)
--- a/services/api/Gemfile
+++ b/services/api/Gemfile
@@ -57,4 +57,4 @@ gem 'test_after_commit', :group => :test
 gem 'google-api-client', '~> 0.6.3'
 gem 'trollop'
 
-gem 'arvados-cli', '>= 0.1.20140307112652'
+#gem 'arvados-cli', '>= 0.1.20140307112652'

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 24193c53db57c2e6c6da1b74550757e3f6f26521..c78f3a7befad32cf4b0bedc0b1b89b4752a00fa2 100644 (file)
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -35,14 +35,6 @@ GEM
     addressable (2.3.5)
     andand (1.3.3)
     arel (3.0.2)
-    arvados-cli (0.1.20140307112652)
-      activesupport (~> 3.2, >= 3.2.13)
-      andand (~> 1.3, >= 1.3.3)
-      curb (~> 0.8)
-      google-api-client (~> 0.6.3)
-      json (~> 1.7, >= 1.7.7)
-      oj (~> 2.0, >= 2.0.3)
-      trollop (~> 2.0)
     autoparse (0.3.3)
       addressable (>= 2.3.1)
       extlib (>= 0.9.15)
@@ -61,7 +53,6 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.6.3)
-    curb (0.8.5)
     daemon_controller (1.1.7)
     erubis (2.7.0)
     execjs (2.0.2)
@@ -191,7 +182,6 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados-cli (>= 0.1.20140307112652)
   coffee-rails (~> 3.2.0)
   google-api-client (~> 0.6.3)
   jquery-rails