Merge 3.7.0 into master (#2667)

Kitware · Jan 16, 2025 · 7da65b4 · 7da65b4
2 parents 9fd9dcc + eb5131a
commit 7da65b4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/app/Utils/AuthTokenUtil.php b/app/Utils/AuthTokenUtil.php
@@ -222,9 +222,9 @@ public static function getTokensForUser(int $user_id): Collection
      */
     public static function getAllTokens(): Collection
     {
-        return AuthToken::select('authtoken.*', 'project.name AS projectname', 'user.firstname AS owner_firstname', 'user.lastname AS owner_lastname')
+        return AuthToken::select('authtoken.*', 'project.name AS projectname', 'users.firstname AS owner_firstname', 'users.lastname AS owner_lastname')
             ->leftJoin('project', 'project.id', '=', 'authtoken.projectid')
-            ->leftJoin('users', 'user.id', '=', 'authtoken.userid')
+            ->leftJoin('users', 'users.id', '=', 'authtoken.userid')
             ->get();
     }
 

diff --git a/config/cdash.php b/config/cdash.php
@@ -23,7 +23,7 @@
         'expires' => env('PASSWORD_EXPIRATION', 0),
         'unique' => env('UNIQUE_PASSWORD_COUNT', 0),
     ],
-    'version' => '3.6.2',
+    'version' => '3.7.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.6.2",
+  "version": "3.7.0",
   "description": "Continuous integration dashboard.",
   "repository": "https://github.com/Kitware/CDash",
   "license": "BSD-3-Clause",