For any project, it's critical to know how the software is used, but tracking usage data is inherently difficult in open-source projects.
Anonymous usage statistics address this need.
When enabled, Jenkins periodically sends information to the Jenkins project.
The Jenkins project uses this information to set development priorities.
-
+
-
General usage statistics
+
General usage statistics
Jenkins reports the following general usage statistics:
@@ -24,7 +24,7 @@
-
Telemetry collection
+
Telemetry collection
@@ -38,24 +38,34 @@
Each trial has a specific purpose and a defined end date, after which collection stops, independent of the installed versions of Jenkins or plugins.
Once a trial is complete, the trial results may be aggregated and shared with the developer community.
-
- The following trials defined on this instance are active now or in the future:
-
+
+
-
-
-
-
${collector.displayName}
-
-
-
- Start date: ${collector.start}
- End date: ${collector.end}
-
-
-
-
-
+
+
+
${%There are currently no active trials.}
+
+
+
+ The following trials defined on this instance are active now or in the future:
+
+
+
+
+
${collector.displayName}
+
+
+
+ Start date: ${collector.start}
+
+ End date: ${collector.end}
+
+
+
+
+
+
+
diff --git a/core/src/main/resources/lib/form/toggleSwitch.jelly b/core/src/main/resources/lib/form/toggleSwitch.jelly
index 2a2da3e94eb4..b0c9fcf5f835 100644
--- a/core/src/main/resources/lib/form/toggleSwitch.jelly
+++ b/core/src/main/resources/lib/form/toggleSwitch.jelly
@@ -76,19 +76,19 @@ THE SOFTWARE.
disabled="${readOnlyMode ? 'true' : null}"
checked="${value ? 'true' : null}"/>
-
- ${description}
+
+ ${attrs.description}
diff --git a/package.json b/package.json
index 5de7d953fe87..1989b499283c 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
"lint": "yarn lint:js && yarn lint:css"
},
"devDependencies": {
- "@babel/cli": "7.25.9",
+ "@babel/cli": "7.26.4",
"@babel/core": "7.26.0",
"@babel/preset-env": "7.26.0",
"@eslint/js": "9.16.0",
diff --git a/src/main/scss/base/_style.scss b/src/main/scss/base/_style.scss
index 273d583d4ca9..98807c6e5401 100644
--- a/src/main/scss/base/_style.scss
+++ b/src/main/scss/base/_style.scss
@@ -372,6 +372,8 @@ pre.console {
border-radius: 6px;
z-index: 0;
+ --section-padding: 0.8rem;
+
&::before {
content: "";
position: absolute;
@@ -389,6 +391,24 @@ pre.console {
p:last-of-type {
margin-bottom: 0;
}
+
+ // add spacing above headings except for when its the first element in the help
+ // the need for this is caused by p:last-of-type setting margin-bottom to 0
+ // unfortunately because of the varied markup I wasn't able to find a way to avoid this
+ h1:not(:first-child),
+ .h1:not(:first-child),
+ h2:not(:first-child),
+ .h2:not(:first-child),
+ h3:not(:first-child),
+ .h3:not(:first-child),
+ h4:not(:first-child),
+ .h4:not(:first-child),
+ h5:not(:first-child),
+ .h5:not(:first-child),
+ h6:not(:first-child),
+ .h6:not(:first-child) {
+ margin-top: var(--section-padding);
+ }
}
.help .from-plugin {
diff --git a/test/pom.xml b/test/pom.xml
index ac3b8efc9a5f..51d946b4390e 100644
--- a/test/pom.xml
+++ b/test/pom.xml
@@ -230,7 +230,7 @@ THE SOFTWARE.
org.jenkins-ci.pluginsjunit
- 1309.v0078b_fecd6ed
+ 1311.v39e1716e4eb_etest
diff --git a/war/pom.xml b/war/pom.xml
index 181ed70b4de5..44e2f0166269 100644
--- a/war/pom.xml
+++ b/war/pom.xml
@@ -314,7 +314,7 @@ THE SOFTWARE.
org.jenkins-ci.pluginsjunit
- 1309.v0078b_fecd6ed
+ 1311.v39e1716e4eb_ehpi
diff --git a/yarn.lock b/yarn.lock
index 9f287c2dd39e..2a4945df8592 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15,9 +15,9 @@ __metadata:
languageName: node
linkType: hard
-"@babel/cli@npm:7.25.9":
- version: 7.25.9
- resolution: "@babel/cli@npm:7.25.9"
+"@babel/cli@npm:7.26.4":
+ version: 7.26.4
+ resolution: "@babel/cli@npm:7.26.4"
dependencies:
"@jridgewell/trace-mapping": "npm:^0.3.25"
"@nicolo-ribaudo/chokidar-2": "npm:2.1.8-no-fsevents.3"
@@ -38,7 +38,7 @@ __metadata:
bin:
babel: ./bin/babel.js
babel-external-helpers: ./bin/babel-external-helpers.js
- checksum: 10c0/2e8228c3715e220fa902888c643ce1a89c4ee90be3d9f7a31218d5bb2500456e0cef12cb90fd5877ab3e5a4498df8f27670425d346422a3eb52052fd3184d520
+ checksum: 10c0/f2d4fc3c4a34dd3001e3bd7084b78b38211003c36afaf2dc8fedf4565c0442bd59b1c64a9f91a0b7b2450e089123f197e09577ae50dc994307c3348b310ce34c
languageName: node
linkType: hard
@@ -4369,7 +4369,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "jenkins-ui@workspace:."
dependencies:
- "@babel/cli": "npm:7.25.9"
+ "@babel/cli": "npm:7.26.4"
"@babel/core": "npm:7.26.0"
"@babel/preset-env": "npm:7.26.0"
"@eslint/js": "npm:9.16.0"