From: Lucas Di Pentima Date: Fri, 21 Aug 2020 21:09:09 +0000 (-0300) Subject: Merge branch 'master' into 16678-login-tokens-lifetime-config X-Git-Tag: 2.1.0~109^2~5 X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/614145d096375ae18c7020e8f9205eaa2a1d0d39 Merge branch 'master' into 16678-login-tokens-lifetime-config Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima --- 614145d096375ae18c7020e8f9205eaa2a1d0d39 diff --cc lib/config/export.go index 92389a73d4,f15a299619..57bea78f05 --- a/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,