Skip to content

Commit 5ffdf7b

Browse files
committed
Merge remote-tracking branch 'origin/main' into copilot/add-copilot-suggestion-menu
2 parents ec89e1c + ee3be3e commit 5ffdf7b

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

src/github/graphql.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ export interface CrossReferencedEvent {
3939
id: string;
4040
actor: Actor;
4141
createdAt: string;
42-
source: {
42+
source?: {
4343
__typename: string;
4444
number: number;
4545
url: string;

src/github/utils.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1265,6 +1265,9 @@ export async function parseCombinedTimelineEvents(
12651265
break;
12661266
case Common.EventType.CrossReferenced:
12671267
const crossRefEv = event as GraphQL.CrossReferencedEvent;
1268+
if (!crossRefEv.source) {
1269+
break;
1270+
}
12681271
const isIssue = crossRefEv.source.__typename === 'Issue';
12691272
const extensionUrl = isIssue
12701273
? await toOpenIssueWebviewUri({ owner: crossRefEv.source.repository.owner.login, repo: crossRefEv.source.repository.name, issueNumber: crossRefEv.source.number })

webviews/common/common.css

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ input[type='checkbox'] {
142142
body button:disabled,
143143
input[type='submit']:disabled {
144144
opacity: 0.4;
145-
border: 1px solid var(--vscode-button-border, transparent) !important;
145+
border: 1px solid var(--vscode-button-background, transparent) !important;
146146
}
147147

148148
body .hidden {
@@ -396,6 +396,8 @@ button.split-left {
396396

397397
.split.disabled {
398398
opacity: 0.4;
399+
border-top: 1px solid var(--vscode-button-background);
400+
border-bottom: 1px solid var(--vscode-button-background);
399401
}
400402

401403
.split.secondary {

yarn.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5058,9 +5058,9 @@ lodash.merge@^4.6.2:
50585058
integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
50595059

50605060
lodash@^4.16.4, lodash@^4.17.15:
5061-
version "4.17.21"
5062-
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
5063-
integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
5061+
version "4.17.23"
5062+
resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.23.tgz#f113b0378386103be4f6893388c73d0bde7f2c5a"
5063+
integrity sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==
50645064

50655065
log-symbols@4.1.0, log-symbols@^4.1.0:
50665066
version "4.1.0"

0 commit comments

Comments
 (0)