diff options
| author | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
|---|---|---|
| committer | George Goldberg <george@gberg.me> | 2018-03-02 15:55:03 +0000 |
| commit | 901acc9703ae58b625b44e7abfd02333b9bab951 (patch) | |
| tree | 1a8fc17a85544bc7b8064874923e2fe6e3f44354 /app/diagnostics.go | |
| parent | 21afaf4bedcad578d4f876bb315d1072ccd296e6 (diff) | |
| parent | 2b3b6051d265edf131d006b2eb14f55284faf1e5 (diff) | |
| download | chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.gz chat-901acc9703ae58b625b44e7abfd02333b9bab951.tar.bz2 chat-901acc9703ae58b625b44e7abfd02333b9bab951.zip | |
Merge branch 'master' into advanced-permissions-phase-1
Diffstat (limited to 'app/diagnostics.go')
| -rw-r--r-- | app/diagnostics.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/diagnostics.go b/app/diagnostics.go index bbc72e63e..ddea3289f 100644 --- a/app/diagnostics.go +++ b/app/diagnostics.go @@ -243,6 +243,8 @@ func (a *App) trackConfig() { "isdefault_image_proxy_type": isDefault(*cfg.ServiceSettings.ImageProxyType, ""), "isdefault_image_proxy_url": isDefault(*cfg.ServiceSettings.ImageProxyURL, ""), "isdefault_image_proxy_options": isDefault(*cfg.ServiceSettings.ImageProxyOptions, ""), + "websocket_url": isDefault(*cfg.ServiceSettings.WebsocketURL, ""), + "allow_cookies_for_subdomains": *cfg.ServiceSettings.AllowCookiesForSubdomains, }) a.SendDiagnostic(TRACK_CONFIG_TEAM, map[string]interface{}{ |