[ARVADOS] updated: 1.1.3-170-g68a21fc

Git user git at public.curoverse.com
Fri Mar 9 13:50:25 EST 2018


Summary of changes:
 apps/workbench/Gemfile      | 4 ++--
 apps/workbench/Gemfile.lock | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

       via  68a21fcc6249024d3c0d39da9fbc6ae727fcda45 (commit)
      from  4004c1e08f0d560736198437cee610b80d4a91b1 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 68a21fcc6249024d3c0d39da9fbc6ae727fcda45
Author: Lucas Di Pentima <ldipentima at veritasgenetics.com>
Date:   Fri Mar 9 15:49:03 2018 -0300

    12737: Fix benchmark & integration tests
    
    Minitest & angularjs-rails gems seem to have incompatible changes
    on newer versions.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <ldipentima at veritasgenetics.com>

diff --git a/apps/workbench/Gemfile b/apps/workbench/Gemfile
index afa9da6..5327cc8 100644
--- a/apps/workbench/Gemfile
+++ b/apps/workbench/Gemfile
@@ -40,7 +40,7 @@ group :development do
 end
 
 group :test, :diagnostics, :performance do
-  gem 'minitest', '~> 5.0'
+  gem 'minitest', '~> 5.10.3'
   gem 'selenium-webdriver'
   gem 'capybara'
   gem 'poltergeist'
@@ -64,7 +64,7 @@ gem 'bootstrap-sass', '~> 3.1.0'
 gem 'bootstrap-x-editable-rails'
 gem 'bootstrap-tab-history-rails'
 
-gem 'angularjs-rails'
+gem 'angularjs-rails', '~> 1.3.8'
 
 gem 'less'
 gem 'less-rails'
diff --git a/apps/workbench/Gemfile.lock b/apps/workbench/Gemfile.lock
index 762b5ba..b19947c 100644
--- a/apps/workbench/Gemfile.lock
+++ b/apps/workbench/Gemfile.lock
@@ -40,7 +40,7 @@ GEM
     addressable (2.5.2)
       public_suffix (>= 2.0.2, < 4.0)
     andand (1.3.3)
-    angularjs-rails (1.6.8)
+    angularjs-rails (1.3.15)
     arel (5.0.1.20140414130214)
     arvados (0.1.20180302192246)
       activesupport (>= 3)
@@ -155,7 +155,7 @@ GEM
     mime-types-data (3.2016.0521)
     mini_mime (1.0.0)
     mini_portile2 (2.3.0)
-    minitest (5.11.3)
+    minitest (5.10.3)
     mocha (1.3.0)
       metaclass (~> 0.0.1)
     morrisjs-rails (0.5.1.2)
@@ -282,7 +282,7 @@ DEPENDENCIES
   RedCloth
   activerecord-nulldb-adapter
   andand
-  angularjs-rails
+  angularjs-rails (~> 1.3.8)
   arvados (>= 0.1.20150511150219)
   bootstrap-sass (~> 3.1.0)
   bootstrap-tab-history-rails
@@ -300,7 +300,7 @@ DEPENDENCIES
   lograge
   logstash-event
   mime-types
-  minitest (~> 5.0)
+  minitest (~> 5.10.3)
   mocha
   morrisjs-rails
   multi_json

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list