Merging in PR results in blank webview (#6975)

Fixes #6974

Author: alexr00

src/github/queriesShared.gql

@@ -1563,6 +1563,9 @@ mutation MergePullRequest($input: MergePullRequestInput!, $last: Int = 150) {
 					...AssignedEvent
 					...UnassignedEvent
 					...HeadRefDeleted
+					...CrossReferencedEvent
+					...ClosedEvent
+					...ReopenedEvent
 				}
 			}
 		}

webviews/components/timeline.tsx

@@ -312,12 +312,12 @@ const MergedEventView = (event: MergedEvent) => {
 					into {event.mergeRef}
 					{nbsp}
 				</div>
-				<Timestamp href={event.url} date={event.createdAt} />
 			</div>
 			{pr.revertable ?
 				<div className="timeline-detail">
 					<button className='secondary' disabled={pr.busy} onClick={revert}>Revert</button>
 				</div> : null}
+			<Timestamp href={event.url} date={event.createdAt} />
 		</div>
 	);
 };
@@ -332,8 +332,8 @@ const HeadDeleteEventView = (event: HeadRefDeleteEvent) => (
 			<div className="message">
 				deleted the {event.headRef} branch{nbsp}
 			</div>
-			<Timestamp date={event.createdAt} />
 		</div>
+		<Timestamp date={event.createdAt} />
 	</div>
 );
 

webviews/editorWebview/index.css

@@ -973,13 +973,14 @@ code {
 
 .timestamp,
 .timestamp:hover {
-	color: var(--vscode-descriptionForeground);;
+	color: var(--vscode-descriptionForeground);
 	white-space: nowrap;
 }
 
 .timestamp {
 	overflow: hidden;
 	text-overflow: ellipsis;
+	padding-left: 8px;
 }
 
 /** Theming */