[ARVADOS-WORKBENCH2] updated: 1.4.1-412-g49a14f5b

[Git user]

Summary of changes:
 src/common/config.ts                  | 6 ++++++
 src/views/login-panel/login-panel.tsx | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

       via  49a14f5b5eacb5b8ad23d033c05597971cc42957 (commit)
       via  bac28b95f3be55f0d5e857fa1630dc7265c9f163 (commit)
       via  eb6593c5f36b115837e01da8a16cbbb625c54a9d (commit)
      from  a708e219cff64023d066dcecabbbd0ab2bd70425 (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 49a14f5b5eacb5b8ad23d033c05597971cc42957
Merge: a708e219 bac28b95
Author: Tom Clegg <tom at tomclegg.ca>
Date:   Wed Aug 26 16:22:08 2020 -0400

    Merge branch '16314-test-user-db'
    
    refs #16314
    
    Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom at tomclegg.ca>

diff --cc src/views/login-panel/login-panel.tsx
index c857c0b2,f7cba4f8..4538802b
--- a/src/views/login-panel/login-panel.tsx
+++ b/src/views/login-panel/login-panel.tsx
@@@ -70,14 -70,9 +70,14 @@@ type LoginPanelProps = DispatchProp<any
      passwordLogin: boolean,
  };
  
- const loginOptions = ['LDAP', 'PAM'];
 -const requirePasswordLogin = (config: Config): boolean => {
 -    if (config && config.clusterConfig) {
 -        return config.clusterConfig.Login.LDAP.Enable || config.clusterConfig.Login.PAM.Enable || config.clusterConfig.Login.Test.Enable || false;
++const loginOptions = ['LDAP', 'PAM', 'Test'];
 +
 +export const requirePasswordLogin = (config: Config): boolean => {
 +    if (config && config.clusterConfig && config.clusterConfig.Login) {
 +        return loginOptions
 +            .filter(loginOption => !!config.clusterConfig.Login[loginOption])
 +            .map(loginOption => config.clusterConfig.Login[loginOption].Enable)
 +            .find(enabled => enabled === true) || false;
      }
      return false;
  };

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


hooks/post-receive
--