Skip to content

Commit

Permalink
Merge branch 'master' into new-build-history-widget
Browse files Browse the repository at this point in the history
  • Loading branch information
janfaracik committed May 18, 2024
2 parents 8285208 + 5089ad5 commit 45a43cd
Show file tree
Hide file tree
Showing 10 changed files with 32 additions and 23 deletions.
2 changes: 1 addition & 1 deletion ath.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -o xtrace
cd "$(dirname "$0")"

# https://github.com/jenkinsci/acceptance-test-harness/releases
export ATH_VERSION=5814.vdc5d6d484b_40
export ATH_VERSION=5829.v1ea_976c1636e

if [[ $# -eq 0 ]]; then
export JDK=17
Expand Down
4 changes: 2 additions & 2 deletions bom/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ THE SOFTWARE.
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-framework-bom</artifactId>
<version>5.3.34</version>
<version>5.3.35</version>
<type>pom</type>
<scope>import</scope>
</dependency>
Expand Down Expand Up @@ -340,7 +340,7 @@ THE SOFTWARE.
<!-- provided by jcl-over-slf4j -->
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
<version>1.3.1</version>
<version>1.3.2</version>
<scope>provided</scope>
</dependency>
</dependencies>
Expand Down
2 changes: 1 addition & 1 deletion core/src/main/resources/hudson/model/Messages.properties
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ Run.UpdatePermission.Description=\
Run.ArtifactsPermission.Description=\
This permission grants the ability to retrieve the artifacts produced by \
builds. If you don’t want an user to access the artifacts, you can do so by \
revoking this permission.
revoking this permission. This does not restrict the listing of artifacts.
Run.InProgressDuration={0} and counting
Run.NotStartedYet=Not started yet
Run.ArtifactsBrowserTitle=Artifacts of {0} {1}
Expand Down
3 changes: 2 additions & 1 deletion core/src/main/resources/hudson/model/Messages_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,8 @@ Run.UpdatePermission.Description=\
par exemple pour laisser des notes sur la cause d''échec d''un build.
Run.ArtifactsPermission.Description=\
Ce droit permet de récupérer les artefacts produits par les builds. \
Si un utilisateur ne doit pas accéder aux artefacts, vous pouvez l''en empêcher en désactivant ce droit.
Si un utilisateur ne doit pas accéder aux artefacts, vous pouvez l''en empêcher en désactivant ce droit. \
Ce droit ne limite pas la possibilité de lister les artefacts.
Run.InProgressDuration={0} et décompte
Run.NotStartedYet=Pas encore commencé
Run.ArtifactsBrowserTitle=Artefacts de {0} {1}
Expand Down
1 change: 1 addition & 0 deletions core/src/main/resources/lib/hudson/progressBar.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ THE SOFTWARE.
<x:attribute name="class">app-progress-bar ${attrs.large?'app-progress-bar--large':null} ${attrs.red?'app-progress-bar--error':null}</x:attribute>
<x:attribute name="href">${attrs.href}</x:attribute>
<x:attribute name="tooltip">${attrs.tooltip}</x:attribute>
<x:attribute name="data-tooltip-append-to-parent">true</x:attribute>
<x:attribute name="id">${attrs.id}</x:attribute>
<x:attribute name="data-tooltip-template">${attrs.tooltipTemplate}</x:attribute>
<j:choose>
Expand Down
4 changes: 3 additions & 1 deletion core/src/main/resources/lib/hudson/queue.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,9 @@ THE SOFTWARE.
<j:set var="stuck" value="${item.isStuck()}"/>
<j:choose>
<j:when test="${h.hasPermission(item.task,item.task.READ)}">
<a href="${rootURL}/${item.task.url}" class="model-link inside tl-tr" tooltip="${item.causesDescription} ${item.why} ${item.params} \n ${%WaitingFor(item.inQueueForString)}">
<a href="${rootURL}/${item.task.url}" class="model-link inside tl-tr"
tooltip="${item.causesDescription} ${item.why} ${item.params} \n ${%WaitingFor(item.inQueueForString)}"
data-tooltip-append-to-parent="true">
<l:breakable value="${item.displayName}"/>
</a>
<!-- TODO include estimated number as in BuildHistoryWidget/entries.jelly if possible -->
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/resources/lib/layout/stopButton.jelly
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ THE SOFTWARE.
</st:documentation>
<j:choose>
<j:when test="${confirm == null}">
<a class="stop-button-link" href="${href}" tooltip="${alt}">
<a class="stop-button-link" href="${href}" tooltip="${alt}" data-tooltip-append-to-parent="true">
<l:icon src="symbol-close" />
</a>
</j:when>
<j:otherwise>
<a class="stop-button-link" href="${href}" data-confirm="${confirm}" tooltip="${alt}">
<a class="stop-button-link" href="${href}" data-confirm="${confirm}" tooltip="${alt}" data-tooltip-append-to-parent="true">
<l:icon src="symbol-close" />
</a>
</j:otherwise>
Expand Down
2 changes: 1 addition & 1 deletion war/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"mini-css-extract-plugin": "2.9.0",
"postcss": "8.4.38",
"postcss-loader": "8.1.1",
"postcss-preset-env": "9.5.12",
"postcss-preset-env": "9.5.13",
"postcss-scss": "4.0.9",
"prettier": "3.2.5",
"sass": "1.77.1",
Expand Down
7 changes: 6 additions & 1 deletion war/src/main/js/components/tooltips/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ const TOOLTIP_BASE = {
arrow: false,
theme: "tooltip",
animation: "tooltip",
appendTo: "parent",
};

/**
Expand All @@ -21,6 +20,10 @@ function registerTooltip(element) {

const tooltip = element.getAttribute("tooltip");
const htmlTooltip = element.getAttribute("data-html-tooltip");
let appendTo = document.body;
if (element.hasAttribute("data-tooltip-append-to-parent")) {
appendTo = "parent";
}
if (
tooltip !== null &&
tooltip.trim().length > 0 &&
Expand All @@ -40,6 +43,7 @@ function registerTooltip(element) {
onHidden(instance) {
instance.reference.setAttribute("title", instance.props.content);
},
appendTo: appendTo,
},
TOOLTIP_BASE,
),
Expand All @@ -58,6 +62,7 @@ function registerTooltip(element) {
instance.reference.getAttribute("data-tooltip-interactive") ===
"true";
},
appendTo: appendTo,
},
TOOLTIP_BASE,
),
Expand Down
26 changes: 13 additions & 13 deletions war/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1432,7 +1432,7 @@ __metadata:
languageName: node
linkType: hard

"@csstools/postcss-cascade-layers@npm:^4.0.5":
"@csstools/postcss-cascade-layers@npm:^4.0.6":
version: 4.0.6
resolution: "@csstools/postcss-cascade-layers@npm:4.0.6"
dependencies:
Expand Down Expand Up @@ -1564,7 +1564,7 @@ __metadata:
languageName: node
linkType: hard

"@csstools/postcss-is-pseudo-class@npm:^4.0.7":
"@csstools/postcss-is-pseudo-class@npm:^4.0.8":
version: 4.0.8
resolution: "@csstools/postcss-is-pseudo-class@npm:4.0.8"
dependencies:
Expand Down Expand Up @@ -3079,7 +3079,7 @@ __metadata:
languageName: node
linkType: hard

"css-has-pseudo@npm:^6.0.4":
"css-has-pseudo@npm:^6.0.5":
version: 6.0.5
resolution: "css-has-pseudo@npm:6.0.5"
dependencies:
Expand Down Expand Up @@ -4389,7 +4389,7 @@ __metadata:
mini-css-extract-plugin: "npm:2.9.0"
postcss: "npm:8.4.38"
postcss-loader: "npm:8.1.1"
postcss-preset-env: "npm:9.5.12"
postcss-preset-env: "npm:9.5.13"
postcss-scss: "npm:4.0.9"
prettier: "npm:3.2.5"
sass: "npm:1.77.1"
Expand Down Expand Up @@ -5714,7 +5714,7 @@ __metadata:
languageName: node
linkType: hard

"postcss-nesting@npm:^12.1.3":
"postcss-nesting@npm:^12.1.4":
version: 12.1.4
resolution: "postcss-nesting@npm:12.1.4"
dependencies:
Expand Down Expand Up @@ -5877,11 +5877,11 @@ __metadata:
languageName: node
linkType: hard

"postcss-preset-env@npm:9.5.12":
version: 9.5.12
resolution: "postcss-preset-env@npm:9.5.12"
"postcss-preset-env@npm:9.5.13":
version: 9.5.13
resolution: "postcss-preset-env@npm:9.5.13"
dependencies:
"@csstools/postcss-cascade-layers": "npm:^4.0.5"
"@csstools/postcss-cascade-layers": "npm:^4.0.6"
"@csstools/postcss-color-function": "npm:^3.0.16"
"@csstools/postcss-color-mix-function": "npm:^2.0.16"
"@csstools/postcss-exponential-functions": "npm:^1.0.7"
Expand All @@ -5891,7 +5891,7 @@ __metadata:
"@csstools/postcss-hwb-function": "npm:^3.0.15"
"@csstools/postcss-ic-unit": "npm:^3.0.6"
"@csstools/postcss-initial": "npm:^1.0.1"
"@csstools/postcss-is-pseudo-class": "npm:^4.0.7"
"@csstools/postcss-is-pseudo-class": "npm:^4.0.8"
"@csstools/postcss-light-dark-function": "npm:^1.0.5"
"@csstools/postcss-logical-float-and-clear": "npm:^2.0.1"
"@csstools/postcss-logical-overflow": "npm:^1.0.1"
Expand All @@ -5913,7 +5913,7 @@ __metadata:
autoprefixer: "npm:^10.4.19"
browserslist: "npm:^4.22.3"
css-blank-pseudo: "npm:^6.0.2"
css-has-pseudo: "npm:^6.0.4"
css-has-pseudo: "npm:^6.0.5"
css-prefers-color-scheme: "npm:^9.0.1"
cssdb: "npm:^8.0.0"
postcss-attribute-case-insensitive: "npm:^6.0.3"
Expand All @@ -5933,7 +5933,7 @@ __metadata:
postcss-image-set-function: "npm:^6.0.3"
postcss-lab-function: "npm:^6.0.16"
postcss-logical: "npm:^7.0.1"
postcss-nesting: "npm:^12.1.3"
postcss-nesting: "npm:^12.1.4"
postcss-opacity-percentage: "npm:^2.0.0"
postcss-overflow-shorthand: "npm:^5.0.1"
postcss-page-break: "npm:^3.0.4"
Expand All @@ -5943,7 +5943,7 @@ __metadata:
postcss-selector-not: "npm:^7.0.2"
peerDependencies:
postcss: ^8.4
checksum: 10c0/3e0276b2061baa396547f9c0090fcb0c6149d3735c7aefa99a8e520701aae0b7265578b59d5e4efa9f5e61659c161e39590a5d63bac49469b99da1c549b63231
checksum: 10c0/5bbb6e87b1b3acc816ef445836f85df5f50ac96bdc3d571952a83794c80863c652d27ab14c66f6b88f86f5664119d49b357e4184162022cc3436676f3fbe833b
languageName: node
linkType: hard

Expand Down

0 comments on commit 45a43cd

Please sign in to comment.