|
@@ -63,6 +63,7 @@ class Config
|
|
|
// bitbucket-oauth
|
|
|
// github-oauth
|
|
|
// gitlab-oauth
|
|
|
+ // gitlab-token
|
|
|
// http-basic
|
|
|
);
|
|
|
|
|
@@ -125,7 +126,7 @@ class Config
|
|
|
// override defaults with given config
|
|
|
if (!empty($config['config']) && is_array($config['config'])) {
|
|
|
foreach ($config['config'] as $key => $val) {
|
|
|
- if (in_array($key, array('bitbucket-oauth', 'github-oauth', 'gitlab-oauth', 'http-basic')) && isset($this->config[$key])) {
|
|
|
+ if (in_array($key, array('bitbucket-oauth', 'github-oauth', 'gitlab-oauth', 'gitlab-token', 'http-basic')) && isset($this->config[$key])) {
|
|
|
$this->config[$key] = array_merge($this->config[$key], $val);
|
|
|
} elseif ('preferred-install' === $key && isset($this->config[$key])) {
|
|
|
if (is_array($val) || is_array($this->config[$key])) {
|