projects / arvados.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0371c73 66c7c73)
Merge branch 'master' into 16678-login-tokens-lifetime-config
authorLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 21 Aug 2020 21:09:09 +0000 (18:09 -0300)
committerLucas Di Pentima <lucas@di-pentima.com.ar>
Fri, 21 Aug 2020 21:10:46 +0000 (18:10 -0300)
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas@di-pentima.com.ar>

1  2 
lib/config/config.default.yml patch | diff1 | diff2 | blob | history
lib/config/export.go patch | diff1 | diff2 | blob | history
lib/config/generated_config.go patch | diff1 | diff2 | blob | history
sdk/go/arvados/config.go patch | diff1 | diff2 | blob | history

diff --cc lib/config/config.default.yml
Simple merge
diff --cc lib/config/export.go
index 92389a73d4e0daa5744621c453e734cb140d3308,f15a2996197804c24face6be71fc4f97afb558f4..57bea78f056b72676de30177c7d48d5e86964408
--- 1/lib/config/export.go
--- 2/lib/config/export.go
+++ b/lib/config/export.go
@@@ -168,9 -170,10 +170,12 @@@ var whitelist = map[string]bool
        "Login.SSO.Enable":                             true,
        "Login.SSO.ProviderAppID":                      false,
        "Login.SSO.ProviderAppSecret":                  false,
 +      "Login.RemoteTokenRefresh":                     true,
 +      "Login.TokenLifetime":                          false,
        "Mail":                                         true,
+       "Mail.EmailFrom":                               false,
+       "Mail.IssueReporterEmailFrom":                  false,
+       "Mail.IssueReporterEmailTo":                    false,
        "Mail.MailchimpAPIKey":                         false,
        "Mail.MailchimpListID":                         false,
        "Mail.SendUserSetupNotificationEmail":          false,
diff --cc lib/config/generated_config.go
Simple merge
diff --cc sdk/go/arvados/config.go
Simple merge