[ARVADOS] updated: 1.3.0-1251-gfe06b864a

[Git user]

Summary of changes:
 apps/workbench/config/application.default.yml | 2 ++
 lib/config/config.default.yml                 | 5 +++++
 lib/config/export.go                          | 1 +
 lib/config/generated_config.go                | 4 ++++
 sdk/go/arvados/config.go                      | 1 +
 5 files changed, 13 insertions(+)

       via  fe06b864a537f5b6440a50bf85af9bc93d7aae80 (commit)
      from  00aca76a7915c2d215fcc1dc5c7d31f1bfa70780 (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 fe06b864a537f5b6440a50bf85af9bc93d7aae80
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Wed Jul 3 15:02:55 2019 -0400

    14812: Fix a couple more tests
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/apps/workbench/config/application.default.yml b/apps/workbench/config/application.default.yml
index 9ea2cb34a..3e2f2b134 100644
--- a/apps/workbench/config/application.default.yml
+++ b/apps/workbench/config/application.default.yml
@@ -118,6 +118,8 @@ test:
         - IT
         - Other
 
+  repository_cache: <%= File.expand_path 'tmp/git', Rails.root %>
+
 common:
   assets.js_compressor: false
   assets.css_compressor: false
diff --git a/lib/config/config.default.yml b/lib/config/config.default.yml
index 3a3e4a447..ea4fdd985 100644
--- a/lib/config/config.default.yml
+++ b/lib/config/config.default.yml
@@ -830,9 +830,14 @@ Clusters:
       SiteName: Arvados Workbench
       ProfilingEnabled: false
 
+      # This is related to obsolete Google OpenID 1.0 login
+      # but some workbench stuff still expects it to be set.
+      DefaultOpenIdPrefix: "https://www.google.com/accounts/o8/id"
+
       # Workbench2 configs
       VocabularyURL: ""
       FileViewersConfigURL: ""
 
+
     # Use experimental controller code (see https://dev.arvados.org/issues/14287)
     EnableBetaController14287: false
diff --git a/lib/config/export.go b/lib/config/export.go
index 3678688a9..b79dec4d9 100644
--- a/lib/config/export.go
+++ b/lib/config/export.go
@@ -149,6 +149,7 @@ var whitelist = map[string]bool{
 	"Workbench.ApplicationMimetypesWithViewIcon.*": true,
 	"Workbench.ArvadosDocsite":                     true,
 	"Workbench.ArvadosPublicDataDocURL":            true,
+	"Workbench.DefaultOpenIdPrefix":                false,
 	"Workbench.EnableGettingStartedPopup":          true,
 	"Workbench.EnablePublicProjectsPage":           true,
 	"Workbench.FileViewersConfigURL":               true,
diff --git a/lib/config/generated_config.go b/lib/config/generated_config.go
index 484e97418..feb203eae 100644
--- a/lib/config/generated_config.go
+++ b/lib/config/generated_config.go
@@ -836,6 +836,10 @@ Clusters:
       SiteName: Arvados Workbench
       ProfilingEnabled: false
 
+      # This is related to obsolete Google OpenID 1.0 login
+      # but some workbench stuff still expects it to be set.
+      DefaultOpenIdPrefix: "https://www.google.com/accounts/o8/id"
+
       # Workbench2 configs
       VocabularyURL: ""
       FileViewersConfigURL: ""
diff --git a/sdk/go/arvados/config.go b/sdk/go/arvados/config.go
index 7d115e019..9c667610b 100644
--- a/sdk/go/arvados/config.go
+++ b/sdk/go/arvados/config.go
@@ -137,6 +137,7 @@ type Cluster struct {
 		ApplicationMimetypesWithViewIcon map[string]struct{}
 		ArvadosDocsite                   string
 		ArvadosPublicDataDocURL          string
+		DefaultOpenIdPrefix              string
 		EnableGettingStartedPopup        bool
 		EnablePublicProjectsPage         bool
 		FileViewersConfigURL             string

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


hooks/post-receive
--