Commit 8a51f760 authored by DJ Mountney's avatar DJ Mountney 🔴
Browse files

Merge branch 'zj-update-docs' into 'master' 

Update docs on mattermost-gitlab integration

See merge request !1244
parents 557158cc 44ba53af

doc/gitlab-mattermost/README.md

+5 −0
Original line number Diff line number Diff line
@@ -61,6 +61,11 @@ gitlab_rails['enable'] = false 


where `Secret` and `Id` are `application secret` and `application id` received when creating new `Application` authorization in GitLab admin section.



To enable integrations with GitLab, add the following on the GitLab Server:

```ruby

gitlab_rails['mattermost_host'] = "https://mattermost.example.com"

```



Optionally, you can set `mattermost['email_enable_sign_up_with_email'] = false` to force all users to sign-up with GitLab only. See Mattermost [documentation on GitLab SSO](https://docs.mattermost.com/deployment/sso-gitlab.html).



## Manually (re)authorising GitLab Mattermost with GitLab