Skip to content

Commit e5533c2

Browse files
sergeibbbbenferizi
authored andcommitted
Makes sure that cloud version of GitHubEnterprise is used when needed
(gitkraken#3901, gitkraken#3922)
1 parent f144044 commit e5533c2

File tree

1 file changed

+14
-0
lines changed

1 file changed

+14
-0
lines changed

src/plus/integrations/integrationService.ts

+14
Original file line numberDiff line numberDiff line change
@@ -287,8 +287,11 @@ export class IntegrationService implements Disposable {
287287
for (const integrationId of integrationIds) {
288288
try {
289289
const integration = await this.get(integrationId);
290+
<<<<<<< HEAD
290291
if (integration == null) continue;
291292

293+
=======
294+
>>>>>>> 97f89b4d6 (Makes sure that cloud version of GitHubEnterprise is used when needed)
292295
if (integration.maybeConnected ?? (await integration.isConnected())) {
293296
connectedIntegrations.add(integrationId);
294297
}
@@ -531,12 +534,16 @@ export class IntegrationService implements Disposable {
531534
break;
532535
case SelfHostedIntegrationId.CloudGitHubEnterprise:
533536
<<<<<<< HEAD
537+
<<<<<<< HEAD
538+
=======
539+
>>>>>>> 97f89b4d6 (Makes sure that cloud version of GitHubEnterprise is used when needed)
534540
if (domain == null) {
535541
integration = this.findCachedById(id);
536542
if (integration != null) {
537543
// return immediately in order to not to cache it after the "switch" block:
538544
return integration;
539545
}
546+
<<<<<<< HEAD
540547

541548
const existingConfigured = await this.getConfigured({
542549
id: SelfHostedIntegrationId.CloudGitHubEnterprise,
@@ -561,6 +568,10 @@ export class IntegrationService implements Disposable {
561568
return undefined;
562569
}
563570

571+
=======
572+
throw new Error(`Domain is required for '${id}' integration`);
573+
}
574+
>>>>>>> 97f89b4d6 (Makes sure that cloud version of GitHubEnterprise is used when needed)
564575
integration = new (
565576
await import(/* webpackChunkName: "integrations" */ './providers/github')
566577
).GitHubEnterpriseIntegration(
@@ -571,8 +582,11 @@ export class IntegrationService implements Disposable {
571582
id,
572583
);
573584
break;
585+
<<<<<<< HEAD
574586
=======
575587
>>>>>>> b8dd1b074 (Adds support for GKDev Cloud GitHub Enterprise integration)
588+
=======
589+
>>>>>>> 97f89b4d6 (Makes sure that cloud version of GitHubEnterprise is used when needed)
576590
case SelfHostedIntegrationId.GitHubEnterprise:
577591
if (domain == null) throw new Error(`Domain is required for '${id}' integration`);
578592
integration = new (

0 commit comments

Comments
 (0)