From fdbfb9a4ed722bfe138ecaf7c5b308191c13925f Mon Sep 17 00:00:00 2001
From: Chris Duarte <csduarte@users.noreply.github.com>
Date: Fri, 24 Nov 2017 09:57:02 -0800
Subject: Replace Channel Name for Team in Email Notifications (#7839)

* allow option to set channel name in email notification subject

* Added TeamName to title when UseChannelInEmailNotifications=true
---
 model/config.go | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index f5e8fe27a..00322156e 100644
--- a/model/config.go
+++ b/model/config.go
@@ -653,6 +653,7 @@ type EmailSettings struct {
 	EnableSignInWithEmail             *bool
 	EnableSignInWithUsername          *bool
 	SendEmailNotifications            bool
+	UseChannelInEmailNotifications    *bool
 	RequireEmailVerification          bool
 	FeedbackName                      string
 	FeedbackEmail                     string
@@ -687,6 +688,10 @@ func (s *EmailSettings) SetDefaults() {
 		s.EnableSignInWithUsername = NewBool(false)
 	}
 
+	if s.UseChannelInEmailNotifications == nil {
+		s.UseChannelInEmailNotifications = NewBool(false)
+	}
+
 	if s.SendPushNotifications == nil {
 		s.SendPushNotifications = NewBool(false)
 	}
-- 
cgit v1.2.3-1-g7c22