From: Pawel Kowalczyk <pawel.kowalczyk@contractors.roche.com>
Date: Tue, 18 Dec 2018 14:46:01 +0000 (+0100)
Subject: Merge branch 'master' into 14565-admin-managing-user
X-Git-Tag: 1.4.0~86^2~3
X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/fe5d65e4e704358fab18d91dae5a97ff7659f5df

Merge branch 'master' into 14565-admin-managing-user

refs #14565

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

fe5d65e4e704358fab18d91dae5a97ff7659f5df
diff --cc src/views/workbench/workbench.tsx
index 6c7c2438,90b2dad0..cca374d6
--- a/src/views/workbench/workbench.tsx
+++ b/src/views/workbench/workbench.tsx
@@@ -232,7 -231,6 +234,7 @@@ export const WorkbenchPanel 
              <UpdateProcessDialog />
              <UpdateProjectDialog />
              <UserAttributesDialog />
 +            <UserManageDialog />
              <VirtualMachineAttributesDialog />
          </Grid>
-     );
+     );