X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/86e078ae126f6651428219c726c34da3bd7f7495..554350245276ee082417cdcfcb8fd3f4f593e00f:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 49775d9652..1dfa92df36 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -1,12 +1,12 @@ GEM remote: https://rubygems.org/ specs: - actionmailer (3.2.17) - actionpack (= 3.2.17) + actionmailer (3.2.22.5) + actionpack (= 3.2.22.5) mail (~> 2.5.4) - actionpack (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) + actionpack (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) erubis (~> 2.7.0) journey (~> 1.0.4) @@ -14,41 +14,41 @@ GEM rack-cache (~> 1.2) rack-test (~> 0.6.1) sprockets (~> 2.2.1) - activemodel (3.2.17) - activesupport (= 3.2.17) + activemodel (3.2.22.5) + activesupport (= 3.2.22.5) builder (~> 3.0.0) - activerecord (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) + activerecord (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) arel (~> 3.0.2) tzinfo (~> 0.3.29) - activeresource (3.2.17) - activemodel (= 3.2.17) - activesupport (= 3.2.17) - activesupport (3.2.17) + activeresource (3.2.22.5) + activemodel (= 3.2.22.5) + activesupport (= 3.2.22.5) + activesupport (3.2.22.5) 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.7) + addressable (2.4.0) andand (1.3.3) arel (3.0.3) - arvados (0.1.20150210011250) - activesupport (>= 3.2.13) + arvados (0.1.20160420143004) + activesupport (>= 3, < 4.2.6) andand (~> 1.3, >= 1.3.3) - google-api-client (~> 0.6.3, >= 0.6.3) + google-api-client (>= 0.7, < 0.9) + i18n (~> 0) json (~> 1.7, >= 1.7.7) - jwt (>= 0.1.5, < 1.0.0) - arvados-cli (0.1.20150205181653) + jwt (>= 0.1.5, < 2) + arvados-cli (0.1.20160503204200) 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.3, >= 0.6.3) + google-api-client (~> 0.6, >= 0.6.3, < 0.9) json (~> 1.7, >= 1.7.7) - jwt (>= 0.1.5, < 1.0.0) oj (~> 2.0, >= 2.0.3) trollop (~> 2.0) autoparse (0.3.3) @@ -69,11 +69,10 @@ GEM coffee-script-source execjs coffee-script-source (1.7.0) - curb (0.8.6) - daemon_controller (1.2.0) + curb (0.9.3) database_cleaner (1.2.0) erubis (2.7.0) - eventmachine (1.0.3) + eventmachine (1.2.0.1) execjs (2.0.2) extlib (0.9.16) factory_girl (4.4.0) @@ -81,20 +80,21 @@ GEM factory_girl_rails (4.4.1) factory_girl (~> 4.4.0) railties (>= 3.0.0) - faraday (0.8.9) - multipart-post (~> 1.2.0) - faye-websocket (0.7.2) + faraday (0.9.2) + multipart-post (>= 1.2, < 3) + faye-websocket (0.10.4) eventmachine (>= 0.12.0) - websocket-driver (>= 0.3.1) - google-api-client (0.6.4) + websocket-driver (>= 0.5.1) + google-api-client (0.7.1) addressable (>= 2.3.2) autoparse (>= 0.3.3) extlib (>= 0.9.15) - faraday (~> 0.8.4) + faraday (>= 0.9.0) jwt (>= 0.1.5) launchy (>= 2.1.1) multi_json (>= 1.0.0) - signet (~> 0.4.5) + retriable (>= 1.4) + signet (>= 0.5.0) uuidtools (>= 2.1.0) hashie (1.2.0) highline (1.6.21) @@ -105,12 +105,17 @@ GEM jquery-rails (3.1.0) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.2) + json (1.8.3) jwt (0.1.13) multi_json (>= 1.5) 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) @@ -118,8 +123,8 @@ GEM mime-types (1.25.1) mocha (1.1.0) metaclass (~> 0.0.1) - multi_json (1.10.1) - multipart-post (1.2.0) + multi_json (1.12.1) + multipart-post (2.0.0) net-scp (1.2.0) net-ssh (>= 2.6.5) net-sftp (2.1.2) @@ -133,61 +138,63 @@ GEM jwt (~> 0.1.4) multi_json (~> 1.0) rack (~> 1.2) - oj (2.11.4) + oj (2.15.0) omniauth (1.1.1) hashie (~> 1.2) rack omniauth-oauth2 (1.1.1) oauth2 (~> 0.8.0) omniauth (~> 1.0) - passenger (4.0.41) - daemon_controller (>= 1.2.0) + passenger (5.0.30) rack rake (>= 0.8.1) - pg (0.17.1) + pg (0.19.0) pg_power (1.6.4) pg rails (~> 3.1) - polyglot (0.3.4) + polyglot (0.3.5) + power_assert (0.3.1) puma (2.8.2) rack (>= 1.1, < 2.0) - rack (1.4.5) - rack-cache (1.2) + rack (1.4.7) + rack-cache (1.6.1) rack (>= 0.4) rack-ssl (1.3.4) rack - rack-test (0.6.2) + rack-test (0.6.3) rack (>= 1.0) - rails (3.2.17) - actionmailer (= 3.2.17) - actionpack (= 3.2.17) - activerecord (= 3.2.17) - activeresource (= 3.2.17) - activesupport (= 3.2.17) + rails (3.2.22.5) + actionmailer (= 3.2.22.5) + actionpack (= 3.2.22.5) + activerecord (= 3.2.22.5) + activeresource (= 3.2.22.5) + activesupport (= 3.2.22.5) bundler (~> 1.0) - railties (= 3.2.17) - railties (3.2.17) - actionpack (= 3.2.17) - activesupport (= 3.2.17) + railties (= 3.2.22.5) + railties (3.2.22.5) + actionpack (= 3.2.22.5) + activesupport (= 3.2.22.5) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (10.2.2) + rake (11.3.0) rdoc (3.12.2) json (~> 1.4) ref (1.0.5) + retriable (2.1.0) 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) sass (>= 3.1.10) tilt (~> 1.3) - signet (0.4.5) + signet (0.5.1) addressable (>= 2.2.3) - faraday (~> 0.8.1) + faraday (>= 0.9.0.rc5) jwt (>= 0.1.5) multi_json (>= 1.0.0) simplecov (0.7.1) @@ -196,12 +203,17 @@ GEM simplecov-html (0.7.1) simplecov-rcov (0.2.3) simplecov (>= 0.4.1) - sprockets (2.2.2) + sprockets (2.2.3) hike (~> 1.2) multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) sshkey (1.6.1) + test-unit (3.2.1) + power_assert + test-unit-activesupport (1.0.6) + activesupport + test-unit test_after_commit (0.2.3) themes_for_rails (0.5.1) rails (>= 3.0.0) @@ -213,13 +225,15 @@ GEM treetop (1.4.15) polyglot polyglot (>= 0.3.1) - trollop (2.1.1) - tzinfo (0.3.39) + trollop (2.1.2) + tzinfo (0.3.51) uglifier (2.5.0) execjs (>= 0.3.0) json (>= 1.8.0) uuidtools (2.1.5) - websocket-driver (0.3.2) + websocket-driver (0.6.4) + websocket-extensions (>= 0.1.0) + websocket-extensions (0.1.2) PLATFORMS ruby @@ -227,14 +241,15 @@ PLATFORMS DEPENDENCIES acts_as_api andand - arvados (>= 0.1.20150210011250) - arvados-cli (>= 0.1.20150128223752) + arvados (>= 0.1.20150615153458) + arvados-cli (>= 0.1.20151207150126) coffee-rails (~> 3.2.0) database_cleaner factory_girl_rails faye-websocket - google-api-client (~> 0.6.3) jquery-rails + lograge + logstash-event mocha multi_json oj @@ -247,12 +262,18 @@ DEPENDENCIES rails (~> 3.2.0) ruby-prof rvm-capistrano + safe_yaml sass-rails (>= 3.2.0) simplecov (~> 0.7.1) simplecov-rcov sshkey + test-unit + test-unit-activesupport test_after_commit themes_for_rails therubyracer trollop uglifier (>= 1.0.3) + +BUNDLED WITH + 1.13.2