projects / arvados-workbench2.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 944b778 fec23db)
Merge branch 'master' into 13864-Virtual-machines
authorPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 26 Nov 2018 12:09:02 +0000 (13:09 +0100)
committerPawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Mon, 26 Nov 2018 12:09:02 +0000 (13:09 +0100)
refs #13864

Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>

1  2 
src/components/icon/icon.tsx patch | diff1 | diff2 | blob | history
src/models/resource.ts patch | diff1 | diff2 | blob | history
src/views/workbench/workbench.tsx patch | diff1 | diff2 | blob | history

diff --cc src/components/icon/icon.tsx
Simple merge
diff --cc src/models/resource.ts
index d2f524fc51d47a4537fd624fd47c9c9952e50b05,5fa617974b173741e69e3b017c7778223a606cc9..679a800a8b6d9e1ac5690c01b9adda0b414c806b
--- 1/src/models/resource.ts
--- 2/src/models/resource.ts
+++ b/src/models/resource.ts
@@@ -29,8 -29,8 +29,9 @@@ export enum ResourceKind 
      PROCESS = "arvados#containerRequest",
      PROJECT = "arvados#group",
      REPOSITORY = "arvados#repository",
+     SSH_KEY = "arvados#authorizedKeys",
      USER = "arvados#user",
 +    VIRTUAL_MACHINE = "arvados#virtualMachine",
      WORKFLOW = "arvados#workflow",
      NONE = "arvados#none"
  }
diff --cc src/views/workbench/workbench.tsx
Simple merge