[ARVADOS-WORKBENCH2] updated: 1.1.4-390-g98237b1

[Git user]

Summary of changes:
 .../current-token-dialog/current-token-dialog.tsx  | 90 ++++++++++++++++++++++
 .../main-app-bar/main-app-bar.test.tsx             |  4 -
 src/views/workbench/workbench.tsx                  | 17 ++++
 3 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 src/views-components/current-token-dialog/current-token-dialog.tsx

       via  98237b19875f6437fa1e01845ad9c911d886cf04 (commit)
       via  de2380dae954f5874badf948e9658aacd6c8e6f9 (commit)
       via  7cf8f4f0b33f358dda43810ceaed52928e60a68d (commit)
       via  98868c72e1f72ff7a9d64fe19a168e0b436a6dfa (commit)
       via  823ac8656c70068c6cd59bb96ec8b6d6201076d9 (commit)
      from  18ff30c75321f3be6a9e02529af2b5e1f1a3ddb0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 98237b19875f6437fa1e01845ad9c911d886cf04
Merge: 18ff30c de2380d
Author: Michal Klobukowski <michal.klobukowski at contractors.roche.com>
Date:   Tue Jul 24 13:36:32 2018 +0200

    Merge branch 'master'
    
    Feature #13753
    
    Arvados-DCO-1.1-Signed-off-by: Michal Klobukowski <michal.klobukowski at contractors.roche.com>

diff --cc src/views/workbench/workbench.tsx
index 912ab87,f3ad839..80a85f1
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -32,7 -32,7 +32,8 @@@ import { sidePanelData, SidePanelIdenti
  import { ProjectResource } from '../../models/project';
  import { ResourceKind } from '../../models/resource';
  import { ContextMenu, ContextMenuKind } from "../../views-components/context-menu/context-menu";
 +import { FavoritePanel } from "../favorite-panel/favorite-panel";
+ import { CurrentTokenDialog } from '../../views-components/current-token-dialog/current-token-dialog';
  
  const drawerWidth = 240;
  const appBarHeight = 100;

-----------------------------------------------------------------------


hooks/post-receive
--