Merge branch 'master'

Feature #13863

Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski@contractors.roche.com>

diff --cc package.json
index 1b196f1b994bd56be35c9a86f366506e8c91207f,c5ffc092d94f6b8655c26a28b978e19cb340c625..af5b28bd1526d069626e99ce63e2fb80821c70c7
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -3,9 -3,8 +3,9 @@@
    "version": "0.1.0",
    "private": true,
    "dependencies": {
-     "@material-ui/core": "1.5.0",
-     "@material-ui/icons": "2.0.2",
 +    "@types/js-yaml": "3.11.2",
+     "@material-ui/core": "3.1.1",
+     "@material-ui/icons": "3.0.1",
      "@types/lodash": "4.14.116",
      "@types/react-copy-to-clipboard": "4.2.6",
      "@types/react-dropzone": "4.2.2",
@@@ -13,8 -12,7 +13,8 @@@
      "@types/shell-quote": "1.6.0",
      "axios": "0.18.0",
      "classnames": "2.2.6",
-     "lodash": "4.17.10",
 +    "js-yaml": "3.12.0",
+     "lodash": "4.17.11",
      "react": "16.5.2",
      "react-copy-to-clipboard": "5.0.1",
      "react-dom": "16.5.2",

diff --cc yarn.lock
index 07c442e11e1584706759fdf334396c3ac1e78238,a361f02a66409f989fe79313f35e5d114dd4db19..d7e88321dc39fe7c032772b2abd77e6500d5cb7c
--- 1/yarn.lock
--- 2/yarn.lock
+++ b/yarn.lock
@@@ -90,20 -92,24 +92,28 @@@
      "@types/react" "*"
  
  "@types/history@*":
-   version "4.6.2"
-   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.6.2.tgz#12cfaba693ba20f114ed5765467ff25fdf67ddb0"
+   version "4.7.0"
+   resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.0.tgz#2fac51050c68f7d6f96c5aafc631132522f4aa3f"
+   integrity sha512-1A/RUAX4VtmGzNTGLSfmiPxQ3XwUSe/1YN4lW9GRa+j307oFK6MPjhlvw6jEHDodUBIvSvrA7/iHDchr5LS+0Q==
  
- "@types/jest@23.3.1":
-   version "23.3.1"
-   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.1.tgz#a4319aedb071d478e6f407d1c4578ec8156829cf"
+ "@types/jest@23.3.2":
+   version "23.3.2"
+   resolved "https://registry.yarnpkg.com/@types/jest/-/jest-23.3.2.tgz#07b90f6adf75d42c34230c026a2529e56c249dbb"
+   integrity sha512-D1xlXHZpDonVX+VJ28XtcD5xlu8ex6Fc4cQNnrm2wJvlQnbec9RedhCrhQr6kRAE9XWHSec+JPuTmqJ9jC0qsA==
+ 
+ "@types/json5@^0.0.29":
+   version "0.0.29"
+   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
+   integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
  
 +"@types/js-yaml@3.11.2":
 +  version "3.11.2"
 +  resolved "https://registry.yarnpkg.com/@types/js-yaml/-/js-yaml-3.11.2.tgz#699ad86054cc20043c30d66a6fcde30bbf5d3d5e"
 +
  "@types/jss@^9.5.3":
-   version "9.5.4"
-   resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.4.tgz#89a4ee32a14a8d2937187b1a7f443750e964a74d"
+   version "9.5.6"
+   resolved "https://registry.yarnpkg.com/@types/jss/-/jss-9.5.6.tgz#96e1d246ddfbccc4867494077c714773cf29acde"
+   integrity sha512-7TWmR5y1jYG4ka4wTZt65RR0kw4WgALFUWktQIWbLnDd6/z/0SQZ/4+UeH0rhdp+HEdIfmzPBH0VwE/4Z9Evzw==
    dependencies:
      csstype "^2.0.0"
      indefinite-observable "^1.0.1"
@@@ -4377,20 -5072,24 +5076,24 @@@ jest@22.4.2
      jest-cli "^22.4.2"
  
  js-base64@^2.1.9:
-   version "2.4.8"
-   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.8.tgz#57a9b130888f956834aa40c5b165ba59c758f033"
- 
- js-tokens@^3.0.0, js-tokens@^3.0.2:
-   version "3.0.2"
-   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+   version "2.4.9"
+   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
+   integrity sha512-xcinL3AuDJk7VSzsHgb9DvvIXayBbadtMZ4HFPx8rUszbW1MuNMlwYVC4zzCZ6e1sqZpnNS5ZFYOhXqA39T7LQ==
  
- "js-tokens@^3.0.0 || ^4.0.0":
+ "js-tokens@^3.0.0 || ^4.0.0", js-tokens@^4.0.0:
    version "4.0.0"
    resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
+   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
+ 
+ js-tokens@^3.0.2:
+   version "3.0.2"
+   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
+   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
  
 -js-yaml@^3.4.3, js-yaml@^3.7.0:
 +js-yaml@3.12.0, js-yaml@^3.4.3, js-yaml@^3.7.0:
    version "3.12.0"
    resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
+   integrity sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==
    dependencies:
      argparse "^1.0.7"
      esprima "^4.0.0"