@@ -287,8 +287,11 @@ export class IntegrationService implements Disposable {
287
287
for ( const integrationId of integrationIds ) {
288
288
try {
289
289
const integration = await this . get ( integrationId ) ;
290
+ < < < << << HEAD
290
291
if ( integration = = null ) continue ;
291
292
293
+ === === =
294
+ > >>> >>> 97 f89b4d6 ( Makes sure that cloud version of GitHubEnterprise is used when needed )
292
295
if ( integration . maybeConnected ?? ( await integration . isConnected ( ) ) ) {
293
296
connectedIntegrations . add ( integrationId ) ;
294
297
}
@@ -531,12 +534,16 @@ export class IntegrationService implements Disposable {
531
534
break ;
532
535
case SelfHostedIntegrationId . CloudGitHubEnterprise :
533
536
<< < < < << HEAD
537
+ << < < < << HEAD
538
+ = === ===
539
+ >>> >>> > 97 f89b4d6 ( Makes sure that cloud version of GitHubEnterprise is used when needed )
534
540
if ( domain == null ) {
535
541
integration = this . findCachedById ( id ) ;
536
542
if ( integration != null ) {
537
543
// return immediately in order to not to cache it after the "switch" block:
538
544
return integration ;
539
545
}
546
+ << < < < << HEAD
540
547
541
548
const existingConfigured = await this . getConfigured ( {
542
549
id : SelfHostedIntegrationId . CloudGitHubEnterprise ,
@@ -561,6 +568,10 @@ export class IntegrationService implements Disposable {
561
568
return undefined ;
562
569
}
563
570
571
+ === = ===
572
+ throw new Error ( `Domain is required for '${ id } ' integration` ) ;
573
+ }
574
+ >>> > >>> 97 f89b4d6 ( Makes sure that cloud version of GitHubEnterprise is used when needed )
564
575
integration = new (
565
576
await import ( /* webpackChunkName: "integrations" */ './providers/github' )
566
577
) . GitHubEnterpriseIntegration (
@@ -571,8 +582,11 @@ export class IntegrationService implements Disposable {
571
582
id ,
572
583
) ;
573
584
break ;
585
+ << < < < << HEAD
574
586
=== = ===
575
587
>>> > >>> b8dd1b074 ( Adds support for GKDev Cloud GitHub Enterprise integration )
588
+ === = ===
589
+ >>> > >>> 97 f89b4d6 ( Makes sure that cloud version of GitHubEnterprise is used when needed )
576
590
case SelfHostedIntegrationId . GitHubEnterprise :
577
591
if ( domain == null ) throw new Error ( `Domain is required for '${ id } ' integration` ) ;
578
592
integration = new (
0 commit comments