mystiq/dex
Archived
4
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #1279 from AnianZ/master

Browse source 
fix default baseURL for GitLab connector
This commit is contained in:
Eric Chiang 2018-09-04 08:09:37 -07:00 committed by GitHub
commit 4dc3347106
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Documentation/connectors/gitlab.md
View file

@ -20,8 +20,8 @@ connectors:
# Required field for connector name. # Required field for connector name.
name: GitLab name: GitLab
config: config:
# optional, default = https://www.gitlab.com # optional, default = https://gitlab.com
baseURL: https://www.gitlab.com baseURL: https://gitlab.com
# Credentials can be string literals or pulled from the environment. # Credentials can be string literals or pulled from the environment.
clientID: $GITLAB_APPLICATION_ID clientID: $GITLAB_APPLICATION_ID
clientSecret: $GITLAB_CLIENT_SECRET clientSecret: $GITLAB_CLIENT_SECRET

2
connector/gitlab/gitlab.go
View file

@ -53,7 +53,7 @@ type gitlabGroup struct {
// Open returns a strategy for logging in through GitLab. // Open returns a strategy for logging in through GitLab.
func (c *Config) Open(id string, logger logrus.FieldLogger) (connector.Connector, error) { func (c *Config) Open(id string, logger logrus.FieldLogger) (connector.Connector, error) {
if c.BaseURL == "" { if c.BaseURL == "" {
c.BaseURL = "https://www.gitlab.com" c.BaseURL = "https://gitlab.com"
} }
return &gitlabConnector{ return &gitlabConnector{
baseURL: c.BaseURL, baseURL: c.BaseURL,