diff options
| author | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-12-18 15:59:09 +0300 |
|---|---|---|
| committer | Zeger-Jan van de Weg <zegerjan@gitlab.com> | 2016-12-18 15:59:09 +0300 |
| commit | a9d9895dc7b4c024471f49a61166a6bb402eab9e (patch) | |
| tree | a36edcc9449123a9fd4112dc18c5c18216ae07a1 /config/gitlab.yml.example | |
| parent | b23f32a735459f1c76ac8232f9de06942b1d2f8a (diff) | |
| parent | 546fa165ff728bc2d25ed9b55b95dd1d48139d4a (diff) | |
Merge branch 'master' into 'zj-mattermost-slash-config'
# Conflicts:
# config/gitlab.yml.example
# lib/mattermost/session.rb
# spec/lib/mattermost/session_spec.rb
Diffstat (limited to 'config/gitlab.yml.example')
| -rw-r--r-- | config/gitlab.yml.example | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example index e1e76e8bf73..f53a3d066df 100644 --- a/config/gitlab.yml.example +++ b/config/gitlab.yml.example @@ -153,10 +153,11 @@ production: &base # The location where LFS objects are stored (default: shared/lfs-objects). # storage_path: shared/lfs-objects - # For executing commands from GitLab on Mattermost + ## Mattermost + ## For enabling Add to Mattermost button mattermost: enabled: false - host: 'http://locahost:8065' + host: 'https://mattermost.example.com' ## Gravatar ## For Libravatar see: http://doc.gitlab.com/ce/customization/libravatar.html @@ -575,4 +576,4 @@ test: admin_group: '' staging: - <<: *base + <<: *base
\ No newline at end of file |