[ARVADOS-WORKBENCH2] updated: 1.2.0-932-gdab7bba

[Git user]

Summary of changes:
 src/store/auth/auth-reducer.test.ts                        |  4 +++-
 src/views-components/main-content-bar/main-content-bar.tsx | 10 ++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

       via  dab7bbaf5fdee0e4e56c0bbfe14da5ad42b5869d (commit)
       via  d4068786fd7136cfe21c3ef3ad3040f57ed3385a (commit)
      from  aed25c0fef7e65b307d702e8ee515567d6c2a7c1 (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 dab7bbaf5fdee0e4e56c0bbfe14da5ad42b5869d
Merge: aed25c0 d406878
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date:   Wed Nov 21 15:32:27 2018 +0100

    conflicts
    
    Feature #13865
    
    Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>

diff --cc src/views-components/main-content-bar/main-content-bar.tsx
index 2039f6b,16fa2a9..741a7e0
--- a/src/views-components/main-content-bar/main-content-bar.tsx
+++ b/src/views-components/main-content-bar/main-content-bar.tsx
@@@ -8,7 -8,7 +8,7 @@@ import { DetailsIcon } from "~/componen
  import { Breadcrumbs } from "~/views-components/breadcrumbs/breadcrumbs";
  import { connect } from 'react-redux';
  import { RootState } from '~/store/store';
- import { matchWorkflowRoute, matchRepositoriesRoute } from '~/routes/routes';
 -import { matchWorkflowRoute, matchSshKeysRoute } from '~/routes/routes';
++import { matchWorkflowRoute, matchSshKeysRoute, matchRepositoriesRoute } from '~/routes/routes';
  import { toggleDetailsPanel } from '~/store/details-panel/details-panel-action';
  
  interface MainContentBarProps {
@@@ -22,14 -22,14 +22,20 @@@ const isWorkflowPath = ({ router }: Roo
      return !!match;
  };
  
 +const isRepositoriesPath = ({ router }: RootState) => {
 +    const pathname = router.location ? router.location.pathname : '';
 +    const match = matchRepositoriesRoute(pathname);
 +    return !!match;
 +};
 +
+ const isSshKeysPath = ({ router }: RootState) => {
+     const pathname = router.location ? router.location.pathname : '';
+     const match = matchSshKeysRoute(pathname);
+     return !!match;
+ };
+ 
  export const MainContentBar = connect((state: RootState) => ({
-     buttonVisible: !isWorkflowPath(state) && !isRepositoriesPath(state)
 -    buttonVisible: !isWorkflowPath(state) && !isSshKeysPath(state)
++    buttonVisible: !isWorkflowPath(state) && !isSshKeysPath(state) && !isRepositoriesPath(state)
  }), {
          onDetailsPanelToggle: toggleDetailsPanel
      })((props: MainContentBarProps) =>

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


hooks/post-receive
--