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 'fix-sso-settings' into 'master' 

Fix the SSOSettings Value of "/var/opt/gitlab/mattermost/config.json" is null.

It fixes that the SSOSettings Value of "/var/opt/gitlab/mattermost/config.json" is null.
But "Log in with GitLab" still failed.

The error message in "/var/log/gitlab/mattermost/current" is like following.
```
2015-08-24_09:55:03.34889 [08/24/15 09:55:03] [EROR] /login/gitlab/complete:AuthorizeOAuthUser code=500 rid=xxxxxxxxxx uid= ip=xxx.xxx.xxx.xxx Bad token type [details: token_type=]
```

Refs gitlab-org/gitlab-mattermost#3

See merge request !442
This commit is contained in:
Marin Jankovski 2015-08-24 10:07:24 +00:00 committed by Marin Jankovski
parent 8078c1fe26
commit 1e7453bb71
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/gitlab-cookbooks/gitlab/recipes/mattermost.rb
View File

@ -83,7 +83,7 @@ end
# Populate mattermost configuration options
###
# Try connecting to GitLab only if it is enabled
if gitlab['enable']
if gitlab['gitlab-rails']['enable']
database_ready = pg_helper.is_running? && pg_helper.database_exists?(gitlab['gitlab-rails']['db_database'])
gitlab_oauth = if gitlab['mattermost']['oauth']['gitlab']
gitlab['mattermost']['oauth']['gitlab']
@ -110,4 +110,4 @@ runit_service "mattermost" do
:log_directory => mattermost_log_dir
}.merge(params))
log_options gitlab['logging'].to_hash.merge(gitlab['mattermost'].to_hash)
end
end