X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/d2bb622dce5e765e55942e4da6348f949883d9fc..8be73cb77f5f32d99f8448a66601e802714225da:/services/api/Gemfile.lock diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 1514ce1342..aecf748d10 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -8,37 +8,37 @@ GIT GEM remote: https://rubygems.org/ specs: - actionmailer (4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) + actionmailer (4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) mail (~> 2.5, >= 2.5.4) rails-dom-testing (~> 1.0, >= 1.0.5) - actionpack (4.2.10) - actionview (= 4.2.10) - activesupport (= 4.2.10) + actionpack (4.2.11) + actionview (= 4.2.11) + activesupport (= 4.2.11) rack (~> 1.6) rack-test (~> 0.6.2) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.2) - actionview (4.2.10) - activesupport (= 4.2.10) + actionview (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) erubis (~> 2.7.0) rails-dom-testing (~> 1.0, >= 1.0.5) rails-html-sanitizer (~> 1.0, >= 1.0.3) - activejob (4.2.10) - activesupport (= 4.2.10) + activejob (4.2.11) + activesupport (= 4.2.11) globalid (>= 0.3.0) - activemodel (4.2.10) - activesupport (= 4.2.10) + activemodel (4.2.11) + activesupport (= 4.2.11) builder (~> 3.1) - activerecord (4.2.10) - activemodel (= 4.2.10) - activesupport (= 4.2.10) + activerecord (4.2.11) + activemodel (= 4.2.11) + activesupport (= 4.2.11) arel (~> 6.0) activerecord-deprecated_finders (1.0.4) - activesupport (4.2.10) + activesupport (4.2.11) i18n (~> 0.7) minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) @@ -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) @@ -76,17 +85,18 @@ GEM coffee-script-source execjs coffee-script-source (1.12.2) - concurrent-ruby (1.0.5) + concurrent-ruby (1.1.4) 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,15 +149,15 @@ 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) + mail (2.7.1) mini_mime (>= 0.1.1) memoist (0.16.0) metaclass (0.0.4) - mini_mime (1.0.0) - mini_portile2 (2.3.0) + mini_mime (1.0.1) + mini_portile2 (2.4.0) minitest (5.11.3) mocha (1.5.0) metaclass (~> 0.0.1) @@ -161,8 +171,8 @@ GEM net-ssh (4.2.0) net-ssh-gateway (2.0.0) net-ssh (>= 4.0.0) - nokogiri (1.8.2) - mini_portile2 (~> 2.3.0) + nokogiri (1.9.1) + mini_portile2 (~> 2.4.0) oauth2 (1.4.0) faraday (>= 0.8, < 0.13) jwt (~> 1.0) @@ -185,19 +195,19 @@ GEM protected_attributes (1.1.4) activemodel (>= 4.0.1, < 5.0) public_suffix (3.0.2) - rack (1.6.10) + rack (1.6.11) rack-test (0.6.3) rack (>= 1.0) - rails (4.2.10) - actionmailer (= 4.2.10) - actionpack (= 4.2.10) - actionview (= 4.2.10) - activejob (= 4.2.10) - activemodel (= 4.2.10) - activerecord (= 4.2.10) - activesupport (= 4.2.10) + rails (4.2.11) + actionmailer (= 4.2.11) + actionpack (= 4.2.11) + actionview (= 4.2.11) + activejob (= 4.2.11) + activemodel (= 4.2.11) + activerecord (= 4.2.11) + activesupport (= 4.2.11) bundler (>= 1.3.0, < 2.0) - railties (= 4.2.10) + railties (= 4.2.11) sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) @@ -209,12 +219,12 @@ GEM loofah (~> 2.2, >= 2.2.2) rails-observers (0.1.5) activemodel (>= 4.0) - railties (4.2.10) - actionpack (= 4.2.10) - activesupport (= 4.2.10) + railties (4.2.11) + actionpack (= 4.2.11) + activesupport (= 4.2.11) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (12.3.1) + rake (12.3.2) ref (2.0.0) request_store (1.4.1) rack (>= 1.4) @@ -260,7 +270,7 @@ GEM therubyracer (0.12.3) libv8 (~> 3.16.14.15) ref - thor (0.20.0) + thor (0.20.3) thread_safe (0.3.6) tilt (1.4.1) trollop (2.1.2) @@ -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.17.2