From 8fb070fecfbb91f22c6f540ecf0b77fb8be42ab2 Mon Sep 17 00:00:00 2001
From: George Goldberg <george@gberg.me>
Date: Tue, 22 May 2018 19:06:14 +0100
Subject: MM-10352: Add locking incoming webhooks to a single channel. (#8835)

---
 model/incoming_webhook.go | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

(limited to 'model')

diff --git a/model/incoming_webhook.go b/model/incoming_webhook.go
index ca9bd116d..202073b5b 100644
--- a/model/incoming_webhook.go
+++ b/model/incoming_webhook.go
@@ -16,17 +16,18 @@ const (
 )
 
 type IncomingWebhook struct {
-	Id          string `json:"id"`
-	CreateAt    int64  `json:"create_at"`
-	UpdateAt    int64  `json:"update_at"`
-	DeleteAt    int64  `json:"delete_at"`
-	UserId      string `json:"user_id"`
-	ChannelId   string `json:"channel_id"`
-	TeamId      string `json:"team_id"`
-	DisplayName string `json:"display_name"`
-	Description string `json:"description"`
-	Username    string `json:"username"`
-	IconURL     string `json:"icon_url"`
+	Id            string `json:"id"`
+	CreateAt      int64  `json:"create_at"`
+	UpdateAt      int64  `json:"update_at"`
+	DeleteAt      int64  `json:"delete_at"`
+	UserId        string `json:"user_id"`
+	ChannelId     string `json:"channel_id"`
+	TeamId        string `json:"team_id"`
+	DisplayName   string `json:"display_name"`
+	Description   string `json:"description"`
+	Username      string `json:"username"`
+	IconURL       string `json:"icon_url"`
+	ChannelLocked bool   `json:"channel_locked"`
 }
 
 type IncomingWebhookRequest struct {
-- 
cgit v1.2.3-1-g7c22


From ce378adc97399dcae9e1c9621c584669b813b2d2 Mon Sep 17 00:00:00 2001
From: Saturnino Abril <saturnino.abril@gmail.com>
Date: Wed, 23 May 2018 02:10:27 +0800
Subject: add EnablePreviewModeBanner in config (#8834)

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
---
 model/config.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index 4710658ec..7a2125061 100644
--- a/model/config.go
+++ b/model/config.go
@@ -739,6 +739,7 @@ type EmailSettings struct {
 	EnableEmailBatching               *bool
 	EmailBatchingBufferSize           *int
 	EmailBatchingInterval             *int
+	EnablePreviewModeBanner           *bool
 	SkipServerCertificateVerification *bool
 	EmailNotificationContentsType     *string
 	LoginButtonColor                  *string
@@ -791,6 +792,10 @@ func (s *EmailSettings) SetDefaults() {
 		s.EmailBatchingInterval = NewInt(EMAIL_BATCHING_INTERVAL)
 	}
 
+	if s.EnablePreviewModeBanner == nil {
+		s.EnablePreviewModeBanner = NewBool(true)
+	}
+
 	if s.EnableSMTPAuth == nil {
 		s.EnableSMTPAuth = new(bool)
 		if s.ConnectionSecurity == CONN_SECURITY_NONE {
-- 
cgit v1.2.3-1-g7c22