diff options
| author | Jason Blais <jason@spinpunch.com> | 2018-07-03 05:26:08 -0400 |
|---|---|---|
| committer | Carlos Tadeu Panato Junior <ctadeu@gmail.com> | 2018-07-03 11:26:08 +0200 |
| commit | 8821fee6c270042dcd4346801ceb0e8d828ed733 (patch) | |
| tree | dac1f2b1ff773e28cbba1e23569803e492d0245e /app/diagnostics.go | |
| parent | 4ccb8b7cff7e23b8b3dc21b80b1317f2104307f7 (diff) | |
| download | chat-8821fee6c270042dcd4346801ceb0e8d828ed733.tar.gz chat-8821fee6c270042dcd4346801ceb0e8d828ed733.tar.bz2 chat-8821fee6c270042dcd4346801ceb0e8d828ed733.zip | |
Disable Gfycat by default during Beta and move default keys to server (#9027)
* Update default.json
* Update diagnostics.go
* Added default Gfycat API credentials to server
* Fixed default Gfycat credentials
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 e9b3405be..6612093d4 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, |