gitlab
/
omnibus-gitlab
mirror of https://gitlab.com/gitlab-org/omnibus-gitlab.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zj-mattermost-defaults-part-deux' into 'master' 

Enable overrides for webhooks by default for Mattermost

/cc @markpundsack @ 

Fixes: gitlab-org/omnibus-gitlab#1768 (At least for this iteration, but can be closed)


See merge request !1154
This commit is contained in:
Marin Jankovski 2016-12-12 15:39:48 +00:00
parent f7ea2aaca9 3638d70023
commit 8528864562
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -8,6 +8,7 @@ omnibus-gitlab repository.
- Update git to 2.8.4 381c0b9d
- Clean up apt lists to reduce the Docker image size (Tao Wang) 7e796c5f
- Enable Mattermost slash commands by default 2b3406
- Enable overriding of username and profile picture for webhook on Mattermost by default
- Fix Mattermost authorization with Gitlab
- Add prometheusListenAddr config setting for gitlab-workhorse 12bb9df2
- Fix Mattermost service file not respecting `mattermost['home']` option ca96b4e

4
files/gitlab-config-template/gitlab.rb.template
View File

@ -848,8 +848,8 @@ external_url 'GENERATED_EXTERNAL_URL'
# mattermost['service_segment_developer_key'] = nil
# mattermost['service_google_developer_key'] = nil
# mattermost['service_enable_incoming_webhooks'] = true
# mattermost['service_enable_post_username_override'] = false
# mattermost['service_enable_post_icon_override'] = false
# mattermost['service_enable_post_username_override'] = true
# mattermost['service_enable_post_icon_override'] = true
# mattermost['service_enable_testing'] = false
# mattermost['service_enable_security_fix_alert'] = true
# mattermost['service_enable_insecure_outgoing_connections'] = false

4
files/gitlab-cookbooks/gitlab/attributes/default.rb
View File

@ -777,8 +777,8 @@ default['gitlab']['mattermost']['service_maximum_login_attempts'] = 10
default['gitlab']['mattermost']['service_segment_developer_key'] = nil
default['gitlab']['mattermost']['service_google_developer_key'] = nil
default['gitlab']['mattermost']['service_enable_incoming_webhooks'] = false
default['gitlab']['mattermost']['service_enable_post_username_override'] = false
default['gitlab']['mattermost']['service_enable_post_icon_override'] = false
default['gitlab']['mattermost']['service_enable_post_username_override'] = true
default['gitlab']['mattermost']['service_enable_post_icon_override'] = true
default['gitlab']['mattermost']['service_enable_testing'] = false
default['gitlab']['mattermost']['service_enable_security_fix_alert'] = true
default['gitlab']['mattermost']['service_enable_insecure_outgoing_connections'] = false