From 1a79d1293d310e6910061a492f3d56d0233a80ec Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Mon, 23 Jan 2017 19:37:32 +0000 Subject: [PATCH 1/2] Update docs on mattermost-gitlab integration [ci skip] --- doc/gitlab-mattermost/README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/doc/gitlab-mattermost/README.md b/doc/gitlab-mattermost/README.md index 96493b063..e7e65ef62 100644 --- a/doc/gitlab-mattermost/README.md +++ b/doc/gitlab-mattermost/README.md @@ -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 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 -- GitLab From 44ba53af63637d98efe2d7f3a467c180362ca5b7 Mon Sep 17 00:00:00 2001 From: Zeger-Jan van de Weg Date: Thu, 2 Feb 2017 18:43:15 +0000 Subject: [PATCH 2/2] Improve wording --- doc/gitlab-mattermost/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/gitlab-mattermost/README.md b/doc/gitlab-mattermost/README.md index e7e65ef62..e8746aa9d 100644 --- a/doc/gitlab-mattermost/README.md +++ b/doc/gitlab-mattermost/README.md @@ -61,7 +61,7 @@ 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 on the GitLab Server: +To enable integrations with GitLab, add the following on the GitLab Server: ```ruby gitlab_rails['mattermost_host'] = "https://mattermost.example.com" ``` -- GitLab