diff options
| author | JoramWilander <jwawilander@gmail.com> | 2018-07-07 12:04:18 -0400 |
|---|---|---|
| committer | JoramWilander <jwawilander@gmail.com> | 2018-07-07 12:04:18 -0400 |
| commit | b78b216a3c8eb354085f97f33dac5e7661ac9188 (patch) | |
| tree | dc7a253730a684bc6744c0b0bf36a87944242583 /app/diagnostics.go | |
| parent | 359f12db33d45b6ffade0872ddf3652a5c52f4a8 (diff) | |
| parent | 9e5ec7d09d4c51e278f17f25fb6c0f3484b50a3b (diff) | |
| download | chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.gz chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.tar.bz2 chat-b78b216a3c8eb354085f97f33dac5e7661ac9188.zip | |
Merge branch 'master' into plugins-2
Diffstat (limited to 'app/diagnostics.go')
| -rw-r--r-- | app/diagnostics.go | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index dc0ab4ce8..601cff27f 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -208,6 +208,9 @@ func (a *App) trackConfig() { "enable_user_access_tokens": *cfg.ServiceSettings.EnableUserAccessTokens, "enable_custom_emoji": *cfg.ServiceSettings.EnableCustomEmoji, "enable_emoji_picker": *cfg.ServiceSettings.EnableEmojiPicker, + "enable_gif_picker": *cfg.ServiceSettings.EnableGifPicker, + "gfycat_api_key": isDefault(*cfg.ServiceSettings.GfycatApiKey, model.SERVICE_SETTINGS_DEFAULT_GFYCAT_API_KEY), + "gfycat_api_secret": isDefault(*cfg.ServiceSettings.GfycatApiSecret, model.SERVICE_SETTINGS_DEFAULT_GFYCAT_API_SECRET), "experimental_enable_authentication_transfer": *cfg.ServiceSettings.ExperimentalEnableAuthenticationTransfer, "restrict_custom_emoji_creation": *cfg.ServiceSettings.RestrictCustomEmojiCreation, "enable_testing": cfg.ServiceSettings.EnableTesting, |