diff options
author | Chris <ccbrown112@gmail.com> | 2017-08-02 01:36:54 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-02 01:36:54 -0700 |
commit | 65817e13c7900ea81947e40e177459cfea8acee4 (patch) | |
tree | 8dfc88db36844e4186b4110753be8de976da6371 /model/config.go | |
parent | c6bf235ec2a8613d8ef35607e2aeb8c0cb629f45 (diff) | |
download | chat-65817e13c7900ea81947e40e177459cfea8acee4.tar.gz chat-65817e13c7900ea81947e40e177459cfea8acee4.tar.bz2 chat-65817e13c7900ea81947e40e177459cfea8acee4.zip |
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
Diffstat (limited to 'model/config.go')
-rw-r--r-- | model/config.go | 9 |
1 files changed, 9 insertions, 0 deletions
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() } |