Merge branch 'master' into revamp-build-history-controls

janfaracik · Nov 24, 2023 · 7c0642c · 7c0642c
2 parents 894db14 + a9c34d7
commit 7c0642c
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 28 deletions.
diff --git a/core/src/main/java/hudson/ClassicPluginStrategy.java b/core/src/main/java/hudson/ClassicPluginStrategy.java
@@ -290,6 +290,10 @@ protected ClassLoader createClassLoader(List<File> paths, ClassLoader parent, At
 
         List<URL> urls = new ArrayList<>();
         for (File path : paths) {
+            if (path.getName().startsWith("jenkins-test-harness")) {
+                throw new IllegalStateException("Refusing to load the Jenkins test harness in production (via "
+                        + atts.getValue("Short-Name") + ")");
+            }
             urls.add(path.toURI().toURL());
         }
         URLClassLoader2 classLoader;

diff --git a/pom.xml b/pom.xml
@@ -73,7 +73,7 @@ THE SOFTWARE.
   </issueManagement>
 
   <properties>
-    <revision>2.433</revision>
+    <revision>2.434</revision>
     <changelist>-SNAPSHOT</changelist>
 
     <!-- configuration for patch tracker plugin  -->

diff --git a/war/package.json b/war/package.json
@@ -30,7 +30,7 @@
     "clean-webpack-plugin": "4.0.0",
     "css-loader": "6.8.1",
     "css-minimizer-webpack-plugin": "5.0.1",
-    "eslint": "8.53.0",
+    "eslint": "8.54.0",
     "eslint-config-prettier": "9.0.0",
     "handlebars-loader": "1.7.3",
     "mini-css-extract-plugin": "2.7.6",

diff --git a/war/src/main/js/components/dialogs/index.js b/war/src/main/js/components/dialogs/index.js
@@ -139,7 +139,11 @@ Dialog.prototype.appendButtons = function () {
       }</button>
     </div>`);
 
-  this.dialog.appendChild(buttons);
+  if (this.dialogType === "form") {
+    this.form.appendChild(buttons);
+  } else {
+    this.dialog.appendChild(buttons);
+  }
 
   this.ok = buttons.querySelector("[data-id=ok]");
   this.cancel = buttons.querySelector("[data-id=cancel]");
@@ -172,25 +176,24 @@ Dialog.prototype.show = function () {
     if (this.input != null) {
       this.input.focus();
     }
-    if (this.ok != null) {
+    if (
+      this.ok != null &&
+      (this.dialogType != "form" || !this.options.submitButton)
+    ) {
       this.ok.addEventListener(
         "click",
         (e) => {
-          if (this.dialogType === "form" && this.options.submitButton) {
-            this.form.submit();
-          } else {
-            e.preventDefault();
+          e.preventDefault();
 
-            let value = true;
-            if (this.dialogType === "prompt") {
-              value = this.input.value;
-            }
-            if (this.dialogType === "form") {
-              value = new FormData(this.form);
-            }
-            this.dialog.remove();
-            resolve(value);
+          let value = true;
+          if (this.dialogType === "prompt") {
+            value = this.input.value;
+          }
+          if (this.dialogType === "form") {
+            value = new FormData(this.form);
           }
+          this.dialog.remove();
+          resolve(value);
         },
         { once: true },
       );

diff --git a/war/src/main/scss/base/_style.scss b/war/src/main/scss/base/_style.scss
@@ -459,7 +459,7 @@ div.listview-jobs {
   padding: 0;
   margin-top: 5px;
   white-space: normal;
-  opacity: 0.6;
+  color: var(--text-color-secondary);
   word-break: break-word;
 }
 

diff --git a/war/yarn.lock b/war/yarn.lock
@@ -1802,10 +1802,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@eslint/js@npm:8.53.0":
-  version: 8.53.0
-  resolution: "@eslint/js@npm:8.53.0"
-  checksum: d29f6c207b2f6dc4ef174d16a3c07b0d3a17ca3d805680496ff267edd773e3bac41db4e7dcab622ca1970d892535bd19671e2a756d4eac75e96fd8c8dcdb619b
+"@eslint/js@npm:8.54.0":
+  version: 8.54.0
+  resolution: "@eslint/js@npm:8.54.0"
+  checksum: d61fb4a0be6af2d8cb290121c329697664a75d6255a29926d5454fb02aeb02b87112f67fdf218d10abac42f90c570ac366126751baefc5405d0e017ed0c946c5
   languageName: node
   linkType: hard
 
@@ -3553,14 +3553,14 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint@npm:8.53.0":
-  version: 8.53.0
-  resolution: "eslint@npm:8.53.0"
+"eslint@npm:8.54.0":
+  version: 8.54.0
+  resolution: "eslint@npm:8.54.0"
   dependencies:
     "@eslint-community/eslint-utils": "npm:^4.2.0"
     "@eslint-community/regexpp": "npm:^4.6.1"
     "@eslint/eslintrc": "npm:^2.1.3"
-    "@eslint/js": "npm:8.53.0"
+    "@eslint/js": "npm:8.54.0"
     "@humanwhocodes/config-array": "npm:^0.11.13"
     "@humanwhocodes/module-importer": "npm:^1.0.1"
     "@nodelib/fs.walk": "npm:^1.2.8"
@@ -3597,7 +3597,7 @@ __metadata:
     text-table: "npm:^0.2.0"
   bin:
     eslint: bin/eslint.js
-  checksum: c5cd0049488c0463dab7d97466767ca5a1d0b3b59d0a223122683dc8039ecea30b27867fb9e38906b4c1ab9d09ece8a802a6c540d8905016f1cc4b4bb27329af
+  checksum: 4f205f832bdbd0218cde374b067791f4f76d7abe8de86b2dc849c273899051126d912ebf71531ee49b8eeaa22cad77febdc8f2876698dc2a76e84a8cb976af22
   languageName: node
   linkType: hard
 
@@ -4413,7 +4413,7 @@ __metadata:
     clean-webpack-plugin: "npm:4.0.0"
     css-loader: "npm:6.8.1"
     css-minimizer-webpack-plugin: "npm:5.0.1"
-    eslint: "npm:8.53.0"
+    eslint: "npm:8.54.0"
     eslint-config-prettier: "npm:9.0.0"
     handlebars: "npm:4.7.8"
     handlebars-loader: "npm:1.7.3"