X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d6e1bfee59569d79f0f3e24620280e70aa161403..c47872d7d78f44040494892d91ccbb8970d1907a:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 1514ce1342..e9267dcb3b 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -58,6 +58,15 @@ GEM i18n (~> 0) json (>= 1.7.7, < 3) jwt (>= 0.1.5, < 2) + arvados-cli (1.1.4.20180723133344) + 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.7, < 3) + oj (~> 3.0) + trollop (~> 2.0) autoparse (0.3.3) addressable (>= 2.3.1) extlib (>= 0.9.15) @@ -78,15 +87,16 @@ GEM coffee-script-source (1.12.2) concurrent-ruby (1.0.5) crass (1.0.4) + curb (0.9.6) database_cleaner (1.7.0) erubis (2.7.0) eventmachine (1.2.6) execjs (2.7.0) extlib (0.9.16) - factory_girl (4.9.0) + factory_bot (4.11.1) activesupport (>= 3.0.0) - factory_girl_rails (4.9.0) - factory_girl (~> 4.9.0) + factory_bot_rails (4.11.1) + factory_bot (~> 4.11.1) railties (>= 3.0.0) faraday (0.12.2) multipart-post (>= 1.2, < 3) @@ -139,7 +149,7 @@ GEM railties (>= 4) request_store (~> 1.0) logstash-event (1.2.02) - loofah (2.2.2) + loofah (2.2.3) crass (~> 1.0.2) nokogiri (>= 1.5.9) mail (2.7.0) @@ -161,7 +171,7 @@ GEM net-ssh (4.2.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) - nokogiri (1.8.2) + nokogiri (1.8.5) mini_portile2 (~> 2.3.0) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) @@ -281,9 +291,10 @@ DEPENDENCIES acts_as_api andand arvados (>= 0.1.20150615153458) + arvados-cli coffee-rails (~> 4.0) database_cleaner - factory_girl_rails + factory_bot_rails faye-websocket httpclient jquery-rails @@ -315,4 +326,4 @@ DEPENDENCIES uglifier (~> 2.0) BUNDLED WITH - 1.16.2 + 1.16.3