Merge pull request #9584 from ItzEdgar/gitlab-selfhosted-fix
Updated gitlab integration to include port
This commit is contained in:
@@ -82,11 +82,7 @@ export function readGitLabIntegrationConfig(
|
||||
baseUrl = `https://${host}`;
|
||||
}
|
||||
|
||||
if (host.includes(':')) {
|
||||
throw new Error(
|
||||
`Invalid GitLab integration config, host '${host}' should just be the host name (e.g. "github.com"), not a URL`,
|
||||
);
|
||||
} else if (!isValidHost(host)) {
|
||||
if (!isValidHost(host)) {
|
||||
throw new Error(
|
||||
`Invalid GitLab integration config, '${host}' is not a valid host`,
|
||||
);
|
||||
|
||||
@@ -138,7 +138,7 @@ export async function getProjectId(
|
||||
// Convert
|
||||
// to: https://gitlab.com/api/v4/projects/groupA%2Fteams%2FsubgroupA%2FteamA%2Frepo
|
||||
const repoIDLookup = new URL(
|
||||
`${url.protocol + url.hostname}/api/v4/projects/${encodeURIComponent(
|
||||
`${url.origin}/api/v4/projects/${encodeURIComponent(
|
||||
repo.replace(/^\//, ''),
|
||||
)}`,
|
||||
);
|
||||
|
||||
Reference in New Issue
Block a user