From 6e33b9023d76d89c594cba00dcf3585573f865a8 Mon Sep 17 00:00:00 2001
From: Zack Galbreath <zack.galbreath@kitware.com>
Date: Fri, 16 Nov 2018 16:05:07 -0500
Subject: [PATCH] CDash 2.6.0

---
 gulpfile.js               |  2 +-
 include/version.php       |  2 +-
 package-lock.json         |  2 +-
 package.json              |  2 +-
 public/js/cdashUpgrade.js | 11 +++++++++++
 public/upgrade.php        | 10 ++++++++++
 public/upgrade.xsl        |  1 +
 7 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/gulpfile.js b/gulpfile.js
index b18bdd3f96..0002f22cb0 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -11,7 +11,7 @@
       rename = require("gulp-rename"),
       sourcemaps = require('gulp-sourcemaps'),
       uglify = require('gulp-uglify'),
-      release = false, // Change to true when cutting a release.
+      release = true, // Change to true when cutting a release.
       version;
 
   if (release) {
diff --git a/include/version.php b/include/version.php
index a99ddb50d4..ac5672458b 100644
--- a/include/version.php
+++ b/include/version.php
@@ -16,6 +16,6 @@
 
 // Current version
 $CDASH_VERSION_MAJOR = '2';
-$CDASH_VERSION_MINOR = '5';
+$CDASH_VERSION_MINOR = '6';
 $CDASH_VERSION_PATCH = '0';
 $CDASH_VERSION = $CDASH_VERSION_MAJOR . '.' . $CDASH_VERSION_MINOR . '.' . $CDASH_VERSION_PATCH;
diff --git a/package-lock.json b/package-lock.json
index 5ce252a5b8..bc186eff20 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "CDash",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 5c6c54fed4..16f858211c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "CDash",
-  "version": "2.5.0",
+  "version": "2.6.0",
   "description": "Continuous integration dashboard.",
   "repository": "https://github.com/Kitware/CDash",
   "license": "BSD-3-Clause",
diff --git a/public/js/cdashUpgrade.js b/public/js/cdashUpgrade.js
index ecfd574bf3..04034cbdaa 100644
--- a/public/js/cdashUpgrade.js
+++ b/public/js/cdashUpgrade.js
@@ -83,6 +83,10 @@ function upgrade_tables()
    {
    nextstep = upgrade_2_6;
    }
+  else if(version < 2.8)
+   {
+   nextstep = upgrade_2_8;
+   }
 
   if(nextstep != '')
     {
@@ -166,6 +170,13 @@ function upgrade_2_6()
   sendAjax("#Upgrade-2-6-Status","upgrade.php?upgrade-2-6=1",text,done);
 }
 
+function upgrade_2_8()
+{
+  var text = "Applying 2.8 patches";
+  $("#Upgrade-2-8-Status").html("<img src=\"img/loading.gif\"/> "+text+"...");
+  sendAjax("#Upgrade-2-8-Status","upgrade.php?upgrade-2-8=1",text,done);
+}
+
 
 // empty function needed
 function done()
diff --git a/public/upgrade.php b/public/upgrade.php
index 971e75baa5..328304d01d 100644
--- a/public/upgrade.php
+++ b/public/upgrade.php
@@ -827,6 +827,16 @@
     return;
 }
 
+// 2.8 Upgrade
+if (isset($_GET['upgrade-2-8'])) {
+    // Set the database version
+    setVersion();
+
+    // Put that the upgrade is done in the log
+    add_log('Upgrade done.', 'upgrade-2-8');
+    return;
+}
+
 // When adding new tables they should be added to the SQL installation file
 // and here as well
 if ($Upgrade) {
diff --git a/public/upgrade.xsl b/public/upgrade.xsl
index 6b1f0fbc8b..9c435fc7de 100644
--- a/public/upgrade.xsl
+++ b/public/upgrade.xsl
@@ -97,6 +97,7 @@
 <div id="Upgrade-2-2-Status"></div>
 <div id="Upgrade-2-4-Status"></div>
 <div id="Upgrade-2-6-Status"></div>
+<div id="Upgrade-2-8-Status"></div>
 <br/>
 <div id="DoneStatus"></div>
 <br/>