From cfa09ce0ef1877f6d7404f681414fa300503ea6c Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Tue, 21 Nov 2017 07:45:41 -0800
Subject: [PATCH] Hide pre-release features section of advanced settings pane.
 (#7847)

---
 config/default.json | 3 ++-
 model/config.go     | 1 +
 utils/config.go     | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/config/default.json b/config/default.json
index a78b93f36b..bb9644d45f 100644
--- a/config/default.json
+++ b/config/default.json
@@ -51,7 +51,8 @@
         "EnableUserTypingMessages": true,
         "EnableChannelViewedMessages": true,
         "EnableUserStatuses": true,
-        "ClusterLogTimeoutMilliseconds": 2000
+        "ClusterLogTimeoutMilliseconds": 2000,
+        "EnablePreviewFeatures": true
     },
     "TeamSettings": {
         "SiteName": "Mattermost",
diff --git a/model/config.go b/model/config.go
index 923de3ba76..5b52767ca2 100644
--- a/model/config.go
+++ b/model/config.go
@@ -205,6 +205,7 @@ type ServiceSettings struct {
 	EnableUserStatuses                       *bool
 	ClusterLogTimeoutMilliseconds            *int
 	CloseUnusedDirectMessages                *bool
+	EnablePreviewFeatures                    *bool
 }
 
 func (s *ServiceSettings) SetDefaults() {
diff --git a/utils/config.go b/utils/config.go
index 1dea325351..25e6844116 100644
--- a/utils/config.go
+++ b/utils/config.go
@@ -489,6 +489,7 @@ func getClientConfig(c *model.Config) map[string]string {
 	props["AllowEditPost"] = *c.ServiceSettings.AllowEditPost
 	props["PostEditTimeLimit"] = fmt.Sprintf("%v", *c.ServiceSettings.PostEditTimeLimit)
 	props["CloseUnusedDirectMessages"] = strconv.FormatBool(*c.ServiceSettings.CloseUnusedDirectMessages)
+	props["EnablePreviewFeatures"] = strconv.FormatBool(*c.ServiceSettings.EnablePreviewFeatures)
 
 	props["SendEmailNotifications"] = strconv.FormatBool(c.EmailSettings.SendEmailNotifications)
 	props["SendPushNotifications"] = strconv.FormatBool(*c.EmailSettings.SendPushNotifications)