diff options
| author | Martin Kraft <mkraft@users.noreply.github.com> | 2018-05-22 14:15:54 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-22 14:15:54 -0400 |
| commit | f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab (patch) | |
| tree | 85d274cb7ecca9ea6e8e595b15aa631c54acf1ea /model | |
| parent | 4c683aff7627040ff811f065848a820b2cb19d59 (diff) | |
| parent | ce378adc97399dcae9e1c9621c584669b813b2d2 (diff) | |
| download | chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.gz chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.tar.bz2 chat-f40666f9e8ee9aef5f7e9739f0fa8857bfbc76ab.zip | |
Merge branch 'master' into advanced-permissions-phase-2
Diffstat (limited to 'model')
| -rw-r--r-- | model/config.go | 5 | ||||
| -rw-r--r-- | model/incoming_webhook.go | 23 |
2 files changed, 17 insertions, 11 deletions
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 { 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 { |