From 19039665c3e0b147d370623e1fcdfd321daf0171 Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Fri, 11 Mar 2022 11:28:06 -0500 Subject: [PATCH 1/6] Version bump for CDash v3.1.0 --- app/cdash/include/version.php | 4 ++-- config/cdash.php | 2 +- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/cdash/include/version.php b/app/cdash/include/version.php index 3fa705c8fa..ff1b29f7b8 100644 --- 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/config/cdash.php b/config/cdash.php index cf163e4b00..867faebc5b 100755 --- 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.json b/package.json index f6f5428e45..199b51596f 100644 --- 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", From 2ba746b15ff211a9b3388a9b63ce0418df6e1570 Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Tue, 15 Mar 2022 09:21:01 -0400 Subject: [PATCH 2/6] Remove extra '/' from 'Up' link on build summary page --- app/cdash/public/api/v1/buildSummary.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/cdash/public/api/v1/buildSummary.php b/app/cdash/public/api/v1/buildSummary.php index 5af989ef2d..8bd0adeb9e 100644 --- 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) { From 4fe224e79be24d4cace18ade13b03ec08e9b80b5 Mon Sep 17 00:00:00 2001 From: Zack Galbreath Date: Wed, 16 Mar 2022 13:10:09 -0400 Subject: [PATCH 3/6] Remove a couple more extra '/'s from 'Up' links * test details page * build notes page --- app/cdash/app/Controller/Api/TestDetails.php | 2 +- app/cdash/app/Controller/Api/ViewNotes.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/cdash/app/Controller/Api/TestDetails.php b/app/cdash/app/Controller/Api/TestDetails.php index e56db79079..c31969928d 100644 --- 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 index d40cb93222..e1d474df11 100644 --- 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(); From 2a0fa7d7b2d698a4f5cc0df3a212d4c2c0f2e045 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 24 Mar 2022 10:58:29 +0000 Subject: [PATCH 4/6] Bump minimist from 1.2.5 to 1.2.6 Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a445b148c3..d7181bc5aa 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9371,9 +9371,9 @@ } }, "minimist": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", - "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==" + "version": "1.2.6", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz", + "integrity": "sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==" }, "mkdirp": { "version": "0.5.5", From 309c9189b0205c2d379be1a5cd752f0ce4105691 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 26 Mar 2022 00:30:09 +0000 Subject: [PATCH 5/6] Bump node-forge from 1.2.1 to 1.3.0 Bumps [node-forge](https://github.com/digitalbazaar/forge) from 1.2.1 to 1.3.0. - [Release notes](https://github.com/digitalbazaar/forge/releases) - [Changelog](https://github.com/digitalbazaar/forge/blob/main/CHANGELOG.md) - [Commits](https://github.com/digitalbazaar/forge/compare/v1.2.1...v1.3.0) --- updated-dependencies: - dependency-name: node-forge dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index a445b148c3..d33542b96d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9472,9 +9472,9 @@ } }, "node-forge": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.2.1.tgz", - "integrity": "sha512-Fcvtbb+zBcZXbTTVwqGA5W+MKBj56UjVRevvchv5XrcyXbmNdesfZL37nlcWOfpgHhgmxApw3tQbTr4CqNmX4w==" + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.0.tgz", + "integrity": "sha512-08ARB91bUi6zNKzVmaj3QO7cr397uiDT2nJ63cHjyNtCTWIgvS47j3eT0WfzUwS9+6Z5YshRaoasFkXCKrIYbA==" }, "node-int64": { "version": "0.4.0", From 880026f62f72fb92de272535872c60c085ae7fdd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 29 Mar 2022 22:22:27 +0000 Subject: [PATCH 6/6] Bump guzzlehttp/psr7 from 1.8.2 to 1.8.5 Bumps [guzzlehttp/psr7](https://github.com/guzzle/psr7) from 1.8.2 to 1.8.5. - [Release notes](https://github.com/guzzle/psr7/releases) - [Changelog](https://github.com/guzzle/psr7/blob/1.8.5/CHANGELOG.md) - [Commits](https://github.com/guzzle/psr7/compare/1.8.2...1.8.5) --- updated-dependencies: - dependency-name: guzzlehttp/psr7 dependency-type: indirect ... Signed-off-by: dependabot[bot] --- composer.lock | 57 +++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 11 deletions(-) diff --git a/composer.lock b/composer.lock index 5b67367b37..e60be5e7e1 100644 --- a/composer.lock +++ b/composer.lock @@ -1619,16 +1619,16 @@ }, { "name": "guzzlehttp/psr7", - "version": "1.8.2", + "version": "1.8.5", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91" + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/dc960a912984efb74d0a90222870c72c87f10c91", - "reference": "dc960a912984efb74d0a90222870c72c87f10c91", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/337e3ad8e5716c15f9657bd214d16cc5e69df268", + "reference": "337e3ad8e5716c15f9657bd214d16cc5e69df268", "shasum": "" }, "require": { @@ -1653,25 +1653,46 @@ } }, "autoload": { - "psr-4": { - "GuzzleHttp\\Psr7\\": "src/" - }, "files": [ "src/functions_include.php" - ] + ], + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], "authors": [ + { + "name": "Graham Campbell", + "email": "hello@gjcampbell.co.uk", + "homepage": "https://github.com/GrahamCampbell" + }, { "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" }, + { + "name": "George Mponos", + "email": "gmponos@gmail.com", + "homepage": "https://github.com/gmponos" + }, + { + "name": "Tobias Nyholm", + "email": "tobias.nyholm@gmail.com", + "homepage": "https://github.com/Nyholm" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://github.com/sagikazarmark" + }, { "name": "Tobias Schultze", + "email": "webmaster@tubo-world.de", "homepage": "https://github.com/Tobion" } ], @@ -1688,9 +1709,23 @@ ], "support": { "issues": "https://github.com/guzzle/psr7/issues", - "source": "https://github.com/guzzle/psr7/tree/1.8.2" + "source": "https://github.com/guzzle/psr7/tree/1.8.5" }, - "time": "2021-04-26T09:17:50+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7", + "type": "tidelift" + } + ], + "time": "2022-03-20T21:51:18+00:00" }, { "name": "iron-io/iron_core", @@ -9385,5 +9420,5 @@ "ext-xdebug": "*", "ext-dom": "*" }, - "plugin-api-version": "2.1.0" + "plugin-api-version": "2.2.0" }