From 65817e13c7900ea81947e40e177459cfea8acee4 Mon Sep 17 00:00:00 2001
From: Chris <ccbrown112@gmail.com>
Date: Wed, 2 Aug 2017 01:36:54 -0700
Subject: PLT-6965 jira integration (plus plugin scaffolding) (#6918)

* plugin scaffolding / jira integration

* add vendored testify packages

* webhook fix

* don't change i18n ids

* support configuration watching

* add basic jira plugin configuration to admin console

* fix eslint errors

* fix another eslint warning

* polish

* undo unintentional config.json commit >:(

* test fix

* add jira plugin diagnostics, remove dm support, add bot tag, generate web-safe secrets

* rebase, implement requested changes

* requested changes

* remove tests and minimize makefile change

* add missing license headers

* add missing comma

* remove bad line from Makefile
---
 model/config.go | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'model')

diff --git a/model/config.go b/model/config.go
index 0755f514f..8c7cd0d68 100644
--- a/model/config.go
+++ b/model/config.go
@@ -449,6 +449,10 @@ type JobSettings struct {
 	RunScheduler *bool
 }
 
+type PluginSettings struct {
+	Plugins map[string]interface{}
+}
+
 type Config struct {
 	ServiceSettings       ServiceSettings
 	TeamSettings          TeamSettings
@@ -476,6 +480,7 @@ type Config struct {
 	ElasticsearchSettings ElasticsearchSettings
 	DataRetentionSettings DataRetentionSettings
 	JobSettings           JobSettings
+	PluginSettings        PluginSettings
 }
 
 func (o *Config) ToJson() string {
@@ -1427,6 +1432,10 @@ func (o *Config) SetDefaults() {
 		*o.JobSettings.RunScheduler = true
 	}
 
+	if o.PluginSettings.Plugins == nil {
+		o.PluginSettings.Plugins = make(map[string]interface{})
+	}
+
 	o.defaultWebrtcSettings()
 }
 
-- 
cgit v1.2.3-1-g7c22