diff options
author | Chris <ccbrown112@gmail.com> | 2018-01-22 15:32:50 -0600 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-22 15:32:50 -0600 |
commit | 599991ea731953f772824ce3ed1e591246aa004f (patch) | |
tree | fca0f556f12e56bdcefa74ac6794dec64e04e3fc /config | |
parent | a8445775351c32f8a12081f60bda2099571b2758 (diff) | |
download | chat-599991ea731953f772824ce3ed1e591246aa004f.tar.gz chat-599991ea731953f772824ce3ed1e591246aa004f.tar.bz2 chat-599991ea731953f772824ce3ed1e591246aa004f.zip |
PLT-3383: image proxy support (#7991)
* image proxy support
* go vet fix, remove mistakenly added coverage file
* fix test compile error
* add validation to config settings and documentation to model functions
* add message_source field to post
Diffstat (limited to 'config')
-rw-r--r-- | config/default.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/config/default.json b/config/default.json index 6ebf29789..6474043cb 100644 --- a/config/default.json +++ b/config/default.json @@ -56,7 +56,9 @@ "EnablePreviewFeatures": true, "CloseUnusedDirectMessages": false, "EnableTutorial": true, - "ExperimentalEnableDefaultChannelLeaveJoinMessages": true + "ExperimentalEnableDefaultChannelLeaveJoinMessages": true, + "ImageProxyType": "", + "ImageProxyURL": "" }, "TeamSettings": { "SiteName": "Mattermost", |