Merge branch 'master' into feature/gitlab-source-enum-domains

* master:
  Improve GitLab client tests
  Change GitLab API JWT expire time to 5s
  Read the context of api-secret-key file and store it in app config
  Improve gitlab client tests
  Ensure there is response before defer close it in gitlab.GetVirtualDomain
  Document acrguments for gitlab.NewClient
  Add HTTP client to consume GitLab internal API for Pages

1 files changed, 11 insertions, 10 deletions

diff --git a/app_config.go b/app_config.go
index 379a3696..639ece85 100644
--- a/app_config.go
+++ b/app_config.go
@@ -25,14 +25,15 @@ type appConfig struct {
 	LogFormat  string
 	LogVerbose bool
 
-	StoreSecret       string
-	GitLabServer      string
-	ClientID          string
-	ClientSecret      string
-	RedirectURI       string
-	SentryDSN         string
-	SentryEnvironment string
-	CustomHeaders     []string
+	StoreSecret        string
+	GitLabServer       string
+	GitLabAPISecretKey []byte
+	ClientID           string
+	ClientSecret       string
+	RedirectURI        string
+	SentryDSN          string
+	SentryEnvironment  string
+	CustomHeaders      []string
 }
 
 // GitlabServerURL returns URL to a GitLab instance.
@@ -41,6 +42,6 @@ func (config appConfig) GitlabServerURL() string {
 }
 
 // GitlabClientSecret returns GitLab server access token.
-func (config appConfig) GitlabClientSecret() []byte {
-	return []byte(config.ClientSecret)
+func (config appConfig) GitlabAPISecret() []byte {
+	return config.GitLabAPISecretKey
 }