X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/9090c60b28de593b8bb2ce606a9ab35b62b57608..678f1f40ee15706750d2e6d6868a642e065c57a8:/services/api/Gemfile.lock

diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock
index 3c5a4765fe..f1f03c3125 100644
--- a/services/api/Gemfile.lock
+++ b/services/api/Gemfile.lock
@@ -47,24 +47,24 @@ GEM
       activemodel (>= 3.0.0)
       activesupport (>= 3.0.0)
       rack (>= 1.1.0)
-    addressable (2.5.0)
+    addressable (2.5.1)
       public_suffix (~> 2.0, >= 2.0.2)
     andand (1.3.3)
     arel (6.0.4)
-    arvados (0.1.20170215224121)
+    arvados (0.1.20170629115132)
       activesupport (>= 3, < 4.2.6)
       andand (~> 1.3, >= 1.3.3)
       google-api-client (>= 0.7, < 0.8.9)
       i18n (~> 0)
-      json (~> 1.7, >= 1.7.7)
+      json (>= 1.7.7, < 3)
       jwt (>= 0.1.5, < 2)
-    arvados-cli (0.1.20170322173355)
+    arvados-cli (0.1.20170817171636)
       activesupport (>= 3.2.13, < 5)
       andand (~> 1.3, >= 1.3.3)
       arvados (~> 0.1, >= 0.1.20150128223554)
       curb (~> 0.8)
       google-api-client (~> 0.6, >= 0.6.3, < 0.8.9)
-      json (~> 1.7, >= 1.7.7)
+      json (>= 1.7.7, < 3)
       oj (~> 2.0, >= 2.0.3)
       trollop (~> 2.0)
     autoparse (0.3.3)
@@ -125,7 +125,7 @@ GEM
     hashie (3.5.5)
     highline (1.7.8)
     hike (1.2.3)
-    i18n (0.8.1)
+    i18n (0.8.6)
     jquery-rails (4.2.2)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
@@ -136,7 +136,7 @@ GEM
       addressable (~> 2.3)
     libv8 (3.16.14.19)
     little-plugger (1.1.4)
-    logging (2.2.0)
+    logging (2.2.2)
       little-plugger (~> 1.1)
       multi_json (~> 1.10)
     lograge (0.4.1)
@@ -148,13 +148,13 @@ GEM
       nokogiri (>= 1.5.9)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
-    memoist (0.15.0)
+    memoist (0.16.0)
     metaclass (0.0.4)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mini_portile2 (2.1.0)
-    minitest (5.10.1)
+    minitest (5.10.3)
     mocha (1.2.1)
       metaclass (~> 0.0.1)
     multi_json (1.12.1)
@@ -177,9 +177,9 @@ GEM
       rack (>= 1.2, < 3)
     oj (2.18.5)
     oj_mimic_json (1.0.1)
-    omniauth (1.6.1)
-      hashie (>= 3.4.6, < 3.6.0)
-      rack (>= 1.6.2, < 3)
+    omniauth (1.4.2)
+      hashie (>= 1.2, < 4)
+      rack (>= 1.0, < 3)
     omniauth-oauth2 (1.4.0)
       oauth2 (~> 1.0)
       omniauth (~> 1.2)
@@ -215,6 +215,8 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.3)
       loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     railties (4.2.5.2)
       actionpack (= 4.2.5.2)
       activesupport (= 4.2.5.2)
@@ -267,7 +269,7 @@ GEM
     thread_safe (0.3.6)
     tilt (1.4.1)
     trollop (2.1.2)
-    tzinfo (1.2.2)
+    tzinfo (1.2.3)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
@@ -295,13 +297,14 @@ DEPENDENCIES
   multi_json
   oj
   oj_mimic_json
-  omniauth (~> 1.1)
+  omniauth (~> 1.4.0)
   omniauth-oauth2 (~> 1.1)
   passenger
   pg
   protected_attributes
   puma (~> 2.0)
   rails (~> 4.0)
+  rails-observers
   responders (~> 2.0)
   ruby-prof
   rvm-capistrano
@@ -318,4 +321,4 @@ DEPENDENCIES
   uglifier (~> 2.0)
 
 BUNDLED WITH
-   1.14.3
+   1.15.1