diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-03-23 09:08:49 -0400 |
| commit | 5fa1b3581955761bd39c310bc88b1489d963a9fc (patch) | |
| tree | 25e6dd11592102807abebbb5de100f7d867005d8 /config/default.json | |
| parent | 37f0e5e0ebc0595efe2c65ffb84fa096dc8c5493 (diff) | |
| parent | 87762ae62eb887dfb3fd0957040919aede46f7d4 (diff) | |
| download | chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.gz chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.tar.bz2 chat-5fa1b3581955761bd39c310bc88b1489d963a9fc.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'config/default.json')
| -rw-r--r-- | config/default.json | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/config/default.json b/config/default.json index b05ff11e7..ed0af5cc6 100644 --- a/config/default.json +++ b/config/default.json @@ -211,6 +211,9 @@ "AllowCustomThemes": true, "AllowedThemes": [] }, + "TimezoneSettings": { + "SupportedTimezonesPath": "timezones.json" + }, "GitLabSettings": { "Enable": false, "Secret": "", @@ -282,6 +285,8 @@ "IdpUrl": "", "IdpDescriptorUrl": "", "AssertionConsumerServiceURL": "", + "ScopingIDPProviderId": "", + "ScopingIDPName": "", "IdpCertificateFile": "", "PublicCertificateFile": "", "PrivateKeyFile": "", |