From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Mon, 17 Dec 2018 09:03:09 +0000 (+0100)
Subject: Merge branch 'master' into 14614-outputs-option-does-not-work-from-more-options
X-Git-Tag: 1.4.0~71^2~21^2
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/dbf577587c53e159cf7bd8dfb45dfb64c6ff7bf7

Merge branch 'master' into 14614-outputs-option-does-not-work-from-more-options

refs #14614

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

dbf577587c53e159cf7bd8dfb45dfb64c6ff7bf7
diff --cc src/store/context-menu/context-menu-actions.ts
index 06d10185,6a5e7b78..c43d5685
--- a/src/store/context-menu/context-menu-actions.ts
+++ b/src/store/context-menu/context-menu-actions.ts
@@@ -17,9 -17,7 +17,8 @@@ import { RepositoryResource } from '~/m
  import { SshKeyResource } from '~/models/ssh-key';
  import { VirtualMachinesResource } from '~/models/virtual-machines';
  import { KeepServiceResource } from '~/models/keep-services';
- import { NodeResource } from '~/models/node';
  import { ApiClientAuthorization } from '~/models/api-client-authorization';
 +import { ProcessResource } from '~/models/process';
  
  export const contextMenuActions = unionize({
      OPEN_CONTEXT_MENU: ofType<{ position: ContextMenuPosition, resource: ContextMenuResource }>(),