Merge pull request #1235 from Kitware/releases/3.1

Merge v3.1 release branch to master
Kitware · Mar 31, 2022 · 4b1e749 · 4b1e749
2 parents 093f756 + 7eabe36
commit 4b1e749
Show file tree

Hide file tree

Showing 8 changed files with 61 additions and 26 deletions.
diff --git a/app/cdash/app/Controller/Api/TestDetails.php b/app/cdash/app/Controller/Api/TestDetails.php
@@ -83,7 +83,7 @@ public function getResponse()
         $outputid = $testRow['outputid'];
 
         $menu = [];
-        $menu['back'] = "/viewTest.php?buildid={$this->build->Id}";
+        $menu['back'] = "viewTest.php?buildid={$this->build->Id}";
 
         // Did the user request a specific chart?
         // If so we should make that chart appears when they click next or previous.

diff --git a/app/cdash/app/Controller/Api/ViewNotes.php b/app/cdash/app/Controller/Api/ViewNotes.php
@@ -47,9 +47,9 @@ public function getResponse()
         // Menu
         $menu = [];
         if ($this->build->GetParentId() > 0) {
-            $menu['back'] = '/index.php?project=' . urlencode($this->project->Name) . "&parentid={$this->build->GetParentId()}";
+            $menu['back'] = 'index.php?project=' . urlencode($this->project->Name) . "&parentid={$this->build->GetParentId()}";
         } else {
-            $menu['back'] = '/index.php?project=' . urlencode($this->project->Name) . '&date=' . $this->date;
+            $menu['back'] = 'index.php?project=' . urlencode($this->project->Name) . '&date=' . $this->date;
         }
 
         $previous_buildid = $this->build->GetPreviousBuildId();

diff --git a/app/cdash/include/version.php b/app/cdash/include/version.php
@@ -16,6 +16,6 @@
 
 // Current version
 $CDASH_VERSION_MAJOR = '3';
-$CDASH_VERSION_MINOR = '0';
-$CDASH_VERSION_PATCH = '3';
+$CDASH_VERSION_MINOR = '1';
+$CDASH_VERSION_PATCH = '0';
 $CDASH_VERSION = $CDASH_VERSION_MAJOR . '.' . $CDASH_VERSION_MINOR . '.' . $CDASH_VERSION_PATCH;
diff --git a/app/cdash/public/api/v1/buildSummary.php b/app/cdash/public/api/v1/buildSummary.php
@@ -55,9 +55,9 @@
 
 $menu = [];
 if ($build->GetParentId() > 0) {
-    $menu['back'] = '/index.php?project=' . urlencode($project->Name) . "&parentid={$build->GetParentId()}";
+    $menu['back'] = 'index.php?project=' . urlencode($project->Name) . "&parentid={$build->GetParentId()}";
 } else {
-    $menu['back'] = '/index.php?project=' . urlencode($project->Name) . "&date=$date";
+    $menu['back'] = 'index.php?project=' . urlencode($project->Name) . "&date=$date";
 }
 
 if ($previous_buildid > 0) {

diff --git a/composer.lock b/composer.lock
diff --git a/config/cdash.php b/config/cdash.php
@@ -22,7 +22,7 @@
         'expires' => env('PASSWORD_EXPIRATION', 0),
         'unique' => env('UNIQUE_PASSWORD_COUNT', 0),
     ],
-    'version' => '3.0.1',
+    'version' => '3.1.0',
     'registration' => [
         'email' => [
             'verify' => env('REGISTRATION_EMAIL_VERIFY', true),

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cdash",
-  "version": "3.0.3",
+  "version": "3.1.0",
   "description": "Continuous integration dashboard.",
   "repository": "https://github.com/Kitware/CDash",
   "license": "BSD-3-Clause",