Browse Source

Merge pull request #1279 from AnianZ/master

fix default baseURL for GitLab connector
pull/1270/merge
Eric Chiang 8 years ago committed by GitHub
parent
commit
4dc3347106
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 4
      Documentation/connectors/gitlab.md
  2. 2
      connector/gitlab/gitlab.go

4
Documentation/connectors/gitlab.md

@ -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

@ -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,

Loading…
Cancel
Save