From 031ed12bf8fdd87529fe4280293b14a6fdefca71 Mon Sep 17 00:00:00 2001
From: William Allen <16820599+williamjallen@users.noreply.github.com>
Date: Wed, 13 Nov 2024 10:48:58 -0500
Subject: [PATCH 1/2] Update Laravel to v10.48.23 (#2564)

Addresses https://github.com/advisories/GHSA-gv7v-rgg6-548h.
---
 composer.json |  2 +-
 composer.lock | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/composer.json b/composer.json
index 6f7b32e37..2832eb783 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
     "guzzlehttp/guzzle": "7.9.2",
     "http-interop/http-factory-guzzle": "1.2.0",
     "knplabs/github-api": "3.15.0",
-    "laravel/framework": "10.48.14",
+    "laravel/framework": "10.48.23",
     "laravel/legacy-factories": "1.4.0",
     "laravel/socialite": "5.16.0",
     "laravel/ui": "4.5.2",
diff --git a/composer.lock b/composer.lock
index 2e8bef5f8..56a079088 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "96d8848c6885b904f26594c03542cfe1",
+    "content-hash": "64bfed8460e9adfc126d46f490ae14f3",
     "packages": [
         {
             "name": "24slides/laravel-saml2",
@@ -2145,16 +2145,16 @@
         },
         {
             "name": "laravel/framework",
-            "version": "v10.48.14",
+            "version": "v10.48.23",
             "source": {
                 "type": "git",
                 "url": "https://github.com/laravel/framework.git",
-                "reference": "27cb4736bb7e60a5311ec73160068dfbcf98336b"
+                "reference": "625269ca4881d2b50eded2045cb930960a181d98"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/laravel/framework/zipball/27cb4736bb7e60a5311ec73160068dfbcf98336b",
-                "reference": "27cb4736bb7e60a5311ec73160068dfbcf98336b",
+                "url": "https://api.github.com/repos/laravel/framework/zipball/625269ca4881d2b50eded2045cb930960a181d98",
+                "reference": "625269ca4881d2b50eded2045cb930960a181d98",
                 "shasum": ""
             },
             "require": {
@@ -2348,7 +2348,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2024-06-21T10:06:42+00:00"
+            "time": "2024-11-12T15:39:10+00:00"
         },
         {
             "name": "laravel/legacy-factories",

From 31c77635108e85a21464bada0f5704fbca3c3441 Mon Sep 17 00:00:00 2001
From: William Allen <16820599+williamjallen@users.noreply.github.com>
Date: Wed, 13 Nov 2024 14:27:09 -0500
Subject: [PATCH 2/2] Bump version to 3.6.2 (#2566)

---
 config/cdash.php  | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config/cdash.php b/config/cdash.php
index 3866a3c4a..4834d9885 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.6.1',
+    'version' => '3.6.2',
     'registration' => [
         'email' => [
             'verify' => env('REGISTRATION_EMAIL_VERIFY', true),
diff --git a/package-lock.json b/package-lock.json
index ae7bbd1e5..6ad21cc70 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "cdash",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "cdash",
-      "version": "3.6.1",
+      "version": "3.6.2",
       "license": "BSD-3-Clause",
       "dependencies": {
         "@apollo/client": "^3.11.8",
diff --git a/package.json b/package.json
index 9ef242fa4..1e173d40c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cdash",
-  "version": "3.6.1",
+  "version": "3.6.2",
   "description": "Continuous integration dashboard.",
   "repository": "https://github.com/Kitware/CDash",
   "license": "BSD-3-Clause",