Merge PR mhutchie#473 (CI/CD Status): Resolve conflicts and update tests

Author: AngelAlexQC

CHANGELOG.md

@@ -6,13 +6,15 @@
 * #907 Fixed the Git Graph icon in the Source Control View title.
 * #910 Display GPG signature status for commits (verified/unverified) in the graph.
 * #394 New "Sticky Scroll" option for the Commit Graph.
+* #473 Display CI/CD Status (e.g. GitHub Actions) in the graph.
 
 ### Español
 * #602 Nueva acción "Copiar Hash del Commit al Portapapeles".
 * #637 Solucionado un problema que impedía la carga de la Vista de Gráfico (actualización de TypeScript).
 * #907 Corregido el icono de Git Graph en el título de la Vista de Control de Código Fuente.
 * #910 Muestra el estado de la firma GPG de los commits (verificado/no verificado) en el gráfico.
 * #394 Nueva opción de "Desplazamiento Pegajoso" para el Gráfico de Commits.
+* #473 Muestra el estado de CI/CD (por ejemplo, GitHub Actions) en el gráfico.
 
 ## 1.30.0 - 2021-04-05
 * #395 Added a "Force Fetch" option onto the "Fetch into Local Branch" Dialog, allowing any local branch (that's not checked out) to be reset to the remote branch. This dialog is accessed via the Remote Branch Context Menu.

package.json

@@ -60,6 +60,11 @@
 				"command": "git-graph.clearAvatarCache",
 				"title": "Clear Avatar Cache"
 			},
+			{
+				"category": "Git Graph",
+				"command": "git-graph.clearCICDCache",
+				"title": "Clear CI/CD Status Cache"
+			},
 			{
 				"category": "Git Graph",
 				"command": "git-graph.endAllWorkspaceCodeReviews",
@@ -993,6 +998,11 @@
 					"default": false,
 					"description": "Fetch avatars of commit authors and committers. By enabling this setting, you consent to commit author and committer email addresses being sent GitHub, GitLab or Gravatar, depending on the repositories remote origin."
 				},
+				"git-graph.repository.commits.fetchCICDsMaximumStatuses": {
+					"type": "number",
+					"default": 1000,
+					"description": "Specifies the number of CI/CD fetch maximum statuses."
+				},
 				"git-graph.repository.commits.initialLoad": {
 					"type": "number",
 					"default": 300,