From 84ad215752fde4291070143411a945fa7a94241c Mon Sep 17 00:00:00 2001 From: Tom Clegg Date: Sat, 18 Mar 2017 21:37:00 -0400 Subject: [PATCH] 7709: Update bundle --- services/api/Gemfile | 1 + services/api/Gemfile.lock | 84 ++++++++++++++++++++------------------- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/services/api/Gemfile b/services/api/Gemfile index 39f217f100..ab42bf7f7c 100644 --- a/services/api/Gemfile +++ b/services/api/Gemfile @@ -26,6 +26,7 @@ gem 'pg' # fix bug https://github.com/collectiveidea/json_spec/issues/27 gem 'multi_json' gem 'oj' +gem 'oj_mimic_json' # Gems used only for assets and not required # in production environments by default. diff --git a/services/api/Gemfile.lock b/services/api/Gemfile.lock index 9c9c4ae9e5..6217744e59 100644 --- a/services/api/Gemfile.lock +++ b/services/api/Gemfile.lock @@ -28,22 +28,23 @@ GEM activesupport (3.2.22.5) i18n (~> 0.6, >= 0.6.4) multi_json (~> 1.0) - acts_as_api (0.4.3) + acts_as_api (1.0.0) activemodel (>= 3.0.0) activesupport (>= 3.0.0) rack (>= 1.1.0) - addressable (2.4.0) + addressable (2.5.0) + public_suffix (~> 2.0, >= 2.0.2) andand (1.3.3) arel (3.0.3) - arvados (0.1.20160513152536) + arvados (0.1.20170215224121) 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) jwt (>= 0.1.5, < 2) - arvados-cli (0.1.20161017193526) - activesupport (~> 3.2, >= 3.2.13) + arvados-cli (0.1.20170322173355) + activesupport (>= 3.2.13, < 5) andand (~> 1.3, >= 1.3.3) arvados (~> 0.1, >= 0.1.20150128223554) curb (~> 0.8) @@ -68,21 +69,21 @@ GEM coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.10.0) + coffee-script-source (1.12.2) curb (0.9.3) database_cleaner (1.5.3) erubis (2.7.0) - eventmachine (1.2.0.1) + eventmachine (1.2.3) execjs (2.7.0) extlib (0.9.16) - factory_girl (4.7.0) + factory_girl (4.8.0) activesupport (>= 3.0.0) - factory_girl_rails (4.7.0) - factory_girl (~> 4.7.0) + factory_girl_rails (4.8.0) + factory_girl (~> 4.8.0) railties (>= 3.0.0) - faraday (0.9.2) + faraday (0.11.0) multipart-post (>= 1.2, < 3) - faye-websocket (0.10.4) + faye-websocket (0.10.7) eventmachine (>= 0.12.0) websocket-driver (>= 0.5.1) google-api-client (0.8.7) @@ -104,21 +105,21 @@ GEM multi_json (~> 1.11) os (~> 0.9) signet (~> 0.7) - hashie (3.4.6) + hashie (3.5.5) highline (1.7.8) hike (1.2.3) - i18n (0.7.0) + i18n (0.8.1) journey (1.0.4) jquery-rails (3.1.4) railties (>= 3.0, < 5.0) thor (>= 0.14, < 2.0) - json (1.8.3) + json (1.8.6) jwt (1.5.6) launchy (2.4.3) addressable (~> 2.3) - libv8 (3.16.14.15) + libv8 (3.16.14.19) little-plugger (1.1.4) - logging (2.1.0) + logging (2.2.0) little-plugger (~> 1.1) multi_json (~> 1.10) lograge (0.3.6) @@ -132,44 +133,46 @@ GEM memoist (0.15.0) metaclass (0.0.4) mime-types (1.25.1) - mocha (1.2.0) + mocha (1.2.1) metaclass (~> 0.0.1) multi_json (1.12.1) - multi_xml (0.5.5) + multi_xml (0.6.0) multipart-post (2.0.0) net-scp (1.2.1) net-ssh (>= 2.6.5) net-sftp (2.1.2) net-ssh (>= 2.6.5) - net-ssh (3.2.0) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) - oauth2 (1.2.0) - faraday (>= 0.8, < 0.10) + net-ssh (4.1.0) + net-ssh-gateway (2.0.0) + net-ssh (>= 4.0.0) + oauth2 (1.3.1) + faraday (>= 0.8, < 0.12) jwt (~> 1.0) multi_json (~> 1.3) multi_xml (~> 0.5) rack (>= 1.2, < 3) - oj (2.15.0) - omniauth (1.3.1) + oj (2.18.5) + oj_mimic_json (1.0.1) + omniauth (1.4.2) hashie (>= 1.2, < 4) rack (>= 1.0, < 3) omniauth-oauth2 (1.4.0) oauth2 (~> 1.0) omniauth (~> 1.2) os (0.9.6) - passenger (5.0.30) + passenger (5.1.2) rack rake (>= 0.8.1) - pg (0.19.0) + pg (0.20.0) pg_power (1.6.4) pg rails (~> 3.1) polyglot (0.3.5) - power_assert (0.3.1) + power_assert (1.0.1) + public_suffix (2.0.5) puma (2.16.0) rack (1.4.7) - rack-cache (1.6.1) + rack-cache (1.7.0) rack (>= 0.4) rack-ssl (1.3.4) rack @@ -190,7 +193,7 @@ GEM rake (>= 0.8.7) rdoc (~> 3.4) thor (>= 0.14.6, < 2.0) - rake (11.3.0) + rake (12.0.0) rdoc (3.12.2) json (~> 1.4) ref (2.0.0) @@ -199,7 +202,7 @@ GEM rvm-capistrano (1.5.6) capistrano (~> 2.15.4) safe_yaml (1.0.4) - sass (3.4.22) + sass (3.4.23) sass-rails (3.2.6) railties (~> 3.2.0) sass (>= 3.1.10) @@ -220,27 +223,27 @@ GEM multi_json (~> 1.0) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) - sshkey (1.8.0) - test-unit (3.2.1) + sshkey (1.9.0) + test-unit (3.2.3) power_assert test_after_commit (1.1.0) activerecord (>= 3.2) themes_for_rails (0.5.1) rails (>= 3.0.0) - therubyracer (0.12.2) - libv8 (~> 3.16.14.0) + therubyracer (0.12.3) + libv8 (~> 3.16.14.15) ref - thor (0.19.1) + thor (0.19.4) tilt (1.4.1) treetop (1.4.15) polyglot polyglot (>= 0.3.1) trollop (2.1.2) - tzinfo (0.3.51) + tzinfo (0.3.52) uglifier (2.7.2) execjs (>= 0.3.0) json (>= 1.8.0) - websocket-driver (0.6.4) + websocket-driver (0.6.5) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.2) @@ -262,6 +265,7 @@ DEPENDENCIES mocha multi_json oj + oj_mimic_json omniauth (~> 1.1) omniauth-oauth2 (~> 1.1) passenger @@ -284,4 +288,4 @@ DEPENDENCIES uglifier (~> 2.0) BUNDLED WITH - 1.13.6 + 1.14.3 -- 2.30.2