Merge remote-tracking branch 'origin/master' into origin-2228-check-filter-uuid-columns

[arvados.git] / services / api / Gemfile.lock

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index a96c5fcf59bfe0fafa7ad1d8ecf38a65f800c9ad..95f37df7d449f48cd6585f19a612b639fba3db49 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.20140310170846)
-      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)
@@ -169,6 +160,7 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
+    sqlite3 (1.3.8)
     test_after_commit (0.2.2)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
@@ -191,7 +183,6 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  arvados-cli (>= 0.1.20140310170846)
   coffee-rails (~> 3.2.0)
   google-api-client (~> 0.6.3)
   jquery-rails
@@ -205,6 +196,7 @@ DEPENDENCIES
   redis
   rvm-capistrano
   sass-rails (>= 3.2.0)
+  sqlite3
   test_after_commit
   therubyracer
   trollop