Merge branch '18874-merge-wb2'
authorTom Clegg <tom@curii.com>
Fri, 29 Sep 2023 17:46:58 +0000 (13:46 -0400)
committerTom Clegg <tom@curii.com>
Fri, 29 Sep 2023 17:46:58 +0000 (13:46 -0400)
refs #18874

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

1  2 
.licenseignore
build/run-tests.sh

diff --cc .licenseignore
index af273b837bdb7495ccd70f33814e1b3910e2a540,8de98864f92c1758d7cb148c0e40beb3908fe6df..efa6b1972ecb32588fac1e2fbc6a47eaa72791ef
@@@ -97,4 -97,20 +97,21 @@@ CITATION.cf
  SECURITY.md
  lib/crunchstat/testdata/*
  lib/controller/localdb/testdata/*.pub
 +sdk/ruby-google-api-client/*
+ services/workbench2/*.d.ts
+ services/workbench2/*.css
+ services/workbench2/*.scss
+ services/workbench2/README.md
+ services/workbench2/public/*
+ services/workbench2/.yarnrc
+ services/workbench2/.npmrc
+ services/workbench2/src/lib/cwl-svg/*
+ services/workbench2/tools/arvados_config.yml
+ services/workbench2/cypress/fixtures/files/5mb.bin
+ services/workbench2/cypress/fixtures/files/cat.png
+ services/workbench2/cypress/fixtures/files/banner.html
+ services/workbench2/cypress/fixtures/files/tooltips.txt
+ services/workbench2/cypress/fixtures/webdav-propfind-outputs.xml
+ services/workbench2/.yarn/releases/*
+ services/workbench2/package.json
+ services/workbench2/yarn.lock
Simple merge