From 8821fee6c270042dcd4346801ceb0e8d828ed733 Mon Sep 17 00:00:00 2001 From: Jason Blais Date: Tue, 3 Jul 2018 05:26:08 -0400 Subject: 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 --- app/diagnostics.go | 3 +++ 1 file changed, 3 insertions(+) (limited to 'app/diagnostics.go') 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, -- cgit v1.2.3-1-g7c22