From: Ward Vandewege <ward@curii.com>
Date: Fri, 12 Mar 2021 22:49:39 +0000 (-0500)
Subject: 17119: Merge branch 'master' into 17119-support-filter-groups
X-Git-Tag: 2.1.2.1~7^2~8
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/825ea4fce4ba3568f6105c17e83f4769a9323759

17119: Merge branch 'master' into 17119-support-filter-groups

Arvados-DCO-1.1-Signed-off-by: Ward Vandewege <ward@curii.com>
---

825ea4fce4ba3568f6105c17e83f4769a9323759
diff --cc src/index.tsx
index 610d27c2,b32066a4..31ae8564
--- a/src/index.tsx
+++ b/src/index.tsx
@@@ -36,8 -36,8 +36,8 @@@ import { ServiceRepository } from '~/se
  import { initWebSocket } from '~/websocket/websocket';
  import { Config } from '~/common/config';
  import { addRouteChangeHandlers } from './routes/route-change-handlers';
- import { setCurrentTokenDialogApiHost } from '~/store/current-token-dialog/current-token-dialog-actions';
+ import { setTokenDialogApiHost } from '~/store/token-dialog/token-dialog-actions';
 -import { processResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
 +import { processResourceActionSet, readOnlyProcessResourceActionSet } from '~/views-components/context-menu/action-sets/process-resource-action-set';
  import { progressIndicatorActions } from '~/store/progress-indicator/progress-indicator-actions';
  import { trashedCollectionActionSet } from '~/views-components/context-menu/action-sets/trashed-collection-action-set';
  import { setBuildInfo } from '~/store/app-info/app-info-actions';