[ARVADOS] created: 1.3.0-3053-g201e2b7e3

[Git user]

        at  201e2b7e3965aebc87de3139d31b8f14a312ec6f (commit)


commit 201e2b7e3965aebc87de3139d31b8f14a312ec6f
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date:   Tue Sep 1 11:41:04 2020 -0300

    16679: Adds Workbench.IdleTimeout config setting for WB2.
    
    Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas at di-pentima.com.ar>

diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 80294afaf..07cde3200 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -1332,6 +1332,10 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Idle time after which the user's session will be auto closed.
+      # This feature is disabled when set to zero.
+      IdleTimeout: 0s
+
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.
       WelcomePageHTML: |
diff --git a/lib/config/export.go b/lib/config/export.go
index b203dff26..6ab69d21f 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -237,6 +237,7 @@ var whitelist = map[string]bool{
 	"Workbench.EnableGettingStartedPopup":          true,
 	"Workbench.EnablePublicProjectsPage":           true,
 	"Workbench.FileViewersConfigURL":               true,
+	"Workbench.IdleTimeout":                        true,
 	"Workbench.InactivePageHTML":                   true,
 	"Workbench.LogViewerMaxBytes":                  true,
 	"Workbench.MultiSiteSearch":                    true,
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 57204cf36..4e7e5468c 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -1338,6 +1338,10 @@ Clusters:
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+      # Idle time after which the user's session will be auto closed.
+      # This feature is disabled when set to zero.
+      IdleTimeout: 0s
+
       # Workbench welcome screen, this is HTML text that will be
       # incorporated directly onto the page.
       WelcomePageHTML: |
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 6e1549224..20b7ee0d0 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -259,6 +259,7 @@ type Cluster struct {
 		InactivePageHTML       string
 		SSHHelpPageHTML        string
 		SSHHelpHostSuffix      string
+		IdleTimeout            Duration
 	}
 
 	ForceLegacyAPI14 bool

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


hooks/post-receive
--