From a523b3ec182ca2301602e34b3bb3d7a47c0fbbfa Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Mon, 27 Oct 2014 11:33:18 -0400 Subject: [PATCH] add support for gitlab as a web viewer for version control. This commit adds support for gitlab as a version control viewer type. --- cdash/repository.php | 15 +++++++++++++++ createProject.php | 1 + 2 files changed, 16 insertions(+) diff --git a/cdash/repository.php b/cdash/repository.php index 0dcbf1c8c4..41d06f010d 100644 --- a/cdash/repository.php +++ b/cdash/repository.php @@ -556,6 +556,15 @@ function get_github_diff_url($projecturl, $directory, $file, $revision) return make_cdash_url($diff_url); } +/** Return the GitLab diff URL */ +function get_gitlab_diff_url($projecturl, $directory, $file, $revision) +{ + // GitLab uses 'blob' or 'tree' (singular, no s) + return get_gitoriousish_diff_url($projecturl, $directory, $file, $revision, 'blob'); +} + + + /** Return the cgit diff URL */ function get_cgit_diff_url($projecturl, $directory, $file, $revision) { @@ -720,6 +729,12 @@ function get_github_revision_url($projecturl, $revision, $priorrevision) return get_gitorious_revision_url($projecturl, $revision, $priorrevision); } +/** Return the GitLab revision URL */ +function get_gitlab_revision_url($projecturl, $revision, $priorrevision) +{ + return get_gitorious_revision_url($projecturl, $revision, $priorrevision); +} + /** Return the cgit revision URL */ function get_cgit_revision_url($projecturl, $revision, $priorrevision) { diff --git a/createProject.php b/createProject.php index b887f4c9a9..a2bf3b5ba8 100644 --- a/createProject.php +++ b/createProject.php @@ -586,6 +586,7 @@ function AddCVSViewer($name,$description,$currentViewer) $xml .= AddCVSViewer("cvstrac","CVSTrac",$Project->CvsViewerType); $xml .= AddCVSViewer("fisheye","Fisheye",$Project->CvsViewerType); $xml .= AddCVSViewer("github","GitHub",$Project->CvsViewerType); +$xml .= AddCVSViewer("gitlab","GitLab",$Project->CvsViewerType); $xml .= AddCVSViewer("gitorious","Gitorious",$Project->CvsViewerType); $xml .= AddCVSViewer("gitweb","GitWeb",$Project->CvsViewerType); $xml .= AddCVSViewer("gitweb2","GitWeb2",$Project->CvsViewerType);