File tree Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Expand file tree Collapse file tree 1 file changed +6
-6
lines changed Original file line number Diff line number Diff line change 26
26
});
27
27
28
28
const localCommits = getLocalCommits ();
29
- const remoteCommits = getLocalAndRemoteCommits ();
30
- const unknownCommits = getRemoteCommits ();
29
+ const localAndRemoteCommits = getLocalAndRemoteCommits ();
30
+ const remoteCommits = getRemoteCommits ();
31
31
32
32
let isLoading: boolean ;
33
33
let isInViewport = false ;
34
34
35
- $ : canBePushed = $localCommits .length !== 0 || $unknownCommits .length !== 0 ;
36
- $ : hasUnknownCommits = $unknownCommits .length > 0 ;
35
+ $ : canBePushed = $localCommits .length !== 0 || $remoteCommits .length !== 0 ;
36
+ $ : hasRemoteCommits = $remoteCommits .length > 0 ;
37
37
$ : hasCommits =
38
- $localCommits .length > 0 || $remoteCommits .length > 0 || $unknownCommits .length > 0 ;
38
+ $localCommits .length > 0 || $localAndRemoteCommits .length > 0 || $remoteCommits .length > 0 ;
39
39
</script >
40
40
41
41
{#if ! isUnapplied && hasCommits }
66
66
wide
67
67
projectId ={project .id }
68
68
requiresForce ={$branch .requiresForce }
69
- integrate ={hasUnknownCommits }
69
+ integrate ={hasRemoteCommits }
70
70
{isLoading }
71
71
on:trigger ={async (e ) => {
72
72
isLoading = true ;
You can’t perform that action at this time.
0 commit comments