X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/26e49e64b0a77801c9b3069b8d307a7012f9ad50..c92d3fcdc2ab6bc3ec9bb03567de9203ff9b1f79:/services/api/Gemfile.lock

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 83a324cf3b..7a516d5725 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -1,84 +1,115 @@
 GEM
-  remote: http://rubygems.org/
+  remote: https://rubygems.org/
   specs:
-    actionmailer (3.1.10)
-      actionpack (= 3.1.10)
-      mail (~> 2.3.3)
-    actionpack (3.1.10)
-      activemodel (= 3.1.10)
-      activesupport (= 3.1.10)
+    actionmailer (3.2.17)
+      actionpack (= 3.2.17)
+      mail (~> 2.5.4)
+    actionpack (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.6)
+      journey (~> 1.0.4)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
-    activemodel (3.1.10)
-      activesupport (= 3.1.10)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.10)
-      activemodel (= 3.1.10)
-      activesupport (= 3.1.10)
-      arel (~> 2.2.3)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.10)
-      activemodel (= 3.1.10)
-      activesupport (= 3.1.10)
-    activesupport (3.1.10)
-      multi_json (>= 1.0, < 1.3)
-    acts_as_api (0.4.1)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
+      i18n (~> 0.6, >= 0.6.4)
+      multi_json (~> 1.0)
+    acts_as_api (0.4.2)
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
+    addressable (2.3.6)
     andand (1.3.3)
-    arel (2.2.3)
+    arel (3.0.3)
+    arvados (0.1.20140414145041)
+      activesupport (>= 3.2.13)
+      andand
+      google-api-client (~> 0.6.3)
+      json (>= 1.7.7)
+    arvados-cli (0.1.20140414145041)
+      activesupport (~> 3.2, >= 3.2.13)
+      andand (~> 1.3, >= 1.3.3)
+      arvados (~> 0.1.0)
+      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)
+      multi_json (>= 1.0.0)
     builder (3.0.4)
-    capistrano (2.15.4)
+    capistrano (2.15.5)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
       net-ssh (>= 2.0.14)
       net-ssh-gateway (>= 1.1.0)
-    coffee-rails (3.1.1)
+    coffee-rails (3.2.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0.beta)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
-    coffee-script-source (1.6.2)
-    daemon_controller (1.1.4)
+    coffee-script-source (1.7.0)
+    curb (0.8.5)
+    daemon_controller (1.2.0)
     erubis (2.7.0)
-    execjs (1.4.0)
-      multi_json (~> 1.0)
-    faraday (0.8.7)
-      multipart-post (~> 1.1)
+    execjs (2.0.2)
+    extlib (0.9.16)
+    faraday (0.8.9)
+      multipart-post (~> 1.2.0)
+    google-api-client (0.6.4)
+      addressable (>= 2.3.2)
+      autoparse (>= 0.3.3)
+      extlib (>= 0.9.15)
+      faraday (~> 0.8.4)
+      jwt (>= 0.1.5)
+      launchy (>= 2.1.1)
+      multi_json (>= 1.0.0)
+      signet (~> 0.4.5)
+      uuidtools (>= 2.1.0)
     hashie (1.2.0)
-    highline (1.6.19)
+    highline (1.6.21)
     hike (1.2.3)
-    httpauth (0.2.0)
-    i18n (0.6.4)
-    jquery-rails (3.0.1)
+    httpauth (0.2.1)
+    i18n (0.6.9)
+    journey (1.0.4)
+    jquery-rails (3.1.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    json (1.8.0)
-    jwt (0.1.6)
-      multi_json (>= 1.0)
-    libv8 (3.11.8.17)
-    mail (2.3.3)
-      i18n (>= 0.4.0)
+    json (1.8.1)
+    jwt (0.1.11)
+      multi_json (>= 1.5)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    libv8 (3.16.14.3)
+    mail (2.5.4)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
-    mime-types (1.23)
-    multi_json (1.2.0)
+    mime-types (1.25.1)
+    multi_json (1.9.2)
     multipart-post (1.2.0)
-    net-scp (1.1.1)
+    net-scp (1.2.0)
       net-ssh (>= 2.6.5)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
-    net-ssh (2.6.7)
+    net-ssh (2.8.0)
     net-ssh-gateway (1.2.0)
       net-ssh (>= 2.6.5)
     oauth2 (0.8.1)
@@ -87,72 +118,81 @@ GEM
       jwt (~> 0.1.4)
       multi_json (~> 1.0)
       rack (~> 1.2)
-    oj (2.1.2)
+    oj (2.7.3)
     omniauth (1.1.1)
       hashie (~> 1.2)
       rack
     omniauth-oauth2 (1.1.1)
       oauth2 (~> 0.8.0)
       omniauth (~> 1.0)
-    passenger (4.0.5)
-      daemon_controller (>= 1.1.0)
+    passenger (4.0.41)
+      daemon_controller (>= 1.2.0)
       rack
       rake (>= 0.8.1)
-    pg (0.15.1)
-    polyglot (0.3.3)
-    rack (1.3.10)
+    pg (0.17.1)
+    polyglot (0.3.4)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
-    rack-ssl (1.3.3)
+    rack-ssl (1.3.4)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.10)
-      actionmailer (= 3.1.10)
-      actionpack (= 3.1.10)
-      activerecord (= 3.1.10)
-      activeresource (= 3.1.10)
-      activesupport (= 3.1.10)
+    rails (3.2.17)
+      actionmailer (= 3.2.17)
+      actionpack (= 3.2.17)
+      activerecord (= 3.2.17)
+      activeresource (= 3.2.17)
+      activesupport (= 3.2.17)
       bundler (~> 1.0)
-      railties (= 3.1.10)
-    railties (3.1.10)
-      actionpack (= 3.1.10)
-      activesupport (= 3.1.10)
+      railties (= 3.2.17)
+    railties (3.2.17)
+      actionpack (= 3.2.17)
+      activesupport (= 3.2.17)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
-    rake (10.1.0)
+      thor (>= 0.14.6, < 2.0)
+    rake (10.2.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    redis (3.0.4)
+    redis (3.0.7)
     ref (1.0.5)
-    rvm-capistrano (1.3.2)
-      capistrano (>= 2.0.0)
-    sass (3.1.21)
-    sass-rails (3.1.5)
-      actionpack (~> 3.1.0)
-      railties (~> 3.1.0)
-      sass (~> 3.1.10)
-      tilt (~> 1.3.2)
-    sprockets (2.0.4)
+    rvm-capistrano (1.5.1)
+      capistrano (~> 2.15.4)
+    sass (3.3.4)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
+    signet (0.4.5)
+      addressable (>= 2.2.3)
+      faraday (~> 0.8.1)
+      jwt (>= 0.1.5)
+      multi_json (>= 1.0.0)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    therubyracer (0.11.4)
-      libv8 (~> 3.11.8.12)
+    sqlite3 (1.3.9)
+    test_after_commit (0.2.3)
+    themes_for_rails (0.5.1)
+      rails (>= 3.0.0)
+    therubyracer (0.12.1)
+      libv8 (~> 3.16.14.0)
       ref
-    thor (0.14.6)
-    tilt (1.3.7)
-    treetop (1.4.14)
+    thor (0.19.1)
+    tilt (1.4.1)
+    treetop (1.4.15)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.37)
-    uglifier (2.1.1)
+    trollop (2.0)
+    tzinfo (0.3.39)
+    uglifier (2.5.0)
       execjs (>= 0.3.0)
-      multi_json (~> 1.0, >= 1.0.2)
+      json (>= 1.8.0)
+    uuidtools (2.1.4)
 
 PLATFORMS
   ruby
@@ -160,7 +200,9 @@ PLATFORMS
 DEPENDENCIES
   acts_as_api
   andand
-  coffee-rails (~> 3.1.1)
+  arvados-cli (>= 0.1.20140328152103)
+  coffee-rails (~> 3.2.0)
+  google-api-client (~> 0.6.3)
   jquery-rails
   multi_json
   oj
@@ -168,9 +210,13 @@ DEPENDENCIES
   omniauth-oauth2 (= 1.1.1)
   passenger
   pg
-  rails (= 3.1.10)
+  rails (~> 3.2.0)
   redis
   rvm-capistrano
-  sass-rails (= 3.1.5)
+  sass-rails (>= 3.2.0)
+  sqlite3
+  test_after_commit
+  themes_for_rails
   therubyracer
+  trollop
   uglifier (>= 1.0.3)