X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/a95f899d7ac84f29b3d019aa410d265bb40833e5..b73985d8a0c9173aec57f6a81fe540b2813a5bff:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 7be4e0f39d..6f7875163b 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -42,12 +42,12 @@ GEM i18n (~> 0) json (~> 1.7, >= 1.7.7) jwt (>= 0.1.5, < 2) - arvados-cli (0.1.20160503204200) + arvados-cli (0.1.20161017193526) activesupport (~> 3.2, >= 3.2.13) andand (~> 1.3, >= 1.3.3) arvados (~> 0.1, >= 0.1.20150128223554) curb (~> 0.8) - google-api-client (~> 0.6, >= 0.6.3, < 0.9) + google-api-client (~> 0.6, >= 0.6.3, < 0.8.9) json (~> 1.7, >= 1.7.7) oj (~> 2.0, >= 2.0.3) trollop (~> 2.0) @@ -112,6 +112,11 @@ GEM launchy (2.4.3) addressable (~> 2.3) libv8 (3.16.14.3) + lograge (0.3.6) + actionpack (>= 3) + activesupport (>= 3) + railties (>= 3) + logstash-event (1.2.02) mail (2.5.4) mime-types (~> 1.16) treetop (~> 1.4.8) @@ -182,6 +187,7 @@ GEM ruby-prof (0.15.2) rvm-capistrano (1.5.1) capistrano (~> 2.15.4) + safe_yaml (1.0.4) sass (3.3.4) sass-rails (3.2.6) railties (~> 3.2.0) @@ -230,12 +236,14 @@ DEPENDENCIES acts_as_api andand arvados (>= 0.1.20150615153458) - arvados-cli (>= 0.1.20151207150126) + arvados-cli (>= 0.1.20161017193526) coffee-rails (~> 3.2.0) database_cleaner factory_girl_rails faye-websocket jquery-rails + lograge + logstash-event mocha multi_json oj @@ -248,6 +256,7 @@ DEPENDENCIES rails (~> 3.2.0) ruby-prof rvm-capistrano + safe_yaml sass-rails (>= 3.2.0) simplecov (~> 0.7.1) simplecov-rcov @@ -257,6 +266,3 @@ DEPENDENCIES therubyracer trollop uglifier (>= 1.0.3) - -BUNDLED WITH - 1.12.1