root
/
jenkins
mirror of https://github.com/jenkinsci/jenkins.git
1
0
Fork 0
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge branch 'master' into revamp-dropdowns

This commit is contained in:
Jan Faracik 2024-01-04 13:26:24 +00:00 committed by GitHub
parent 2dd9e32fab 78cdaa9f29
commit 0075375c9a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/resources/jenkins/widgets/HistoryPageFilter/queue-items.jelly
View File

@ -65,7 +65,7 @@ THE SOFTWARE.
<div class="pane build-controls"> <div class="pane build-controls">
<div class="build-stop"> <div class="build-stop">
<j:if test="${item.hasCancelPermission()}"> <j:if test="${item.hasCancelPermission()}">
<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%cancel this build}"/> <l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" alt="${%Cancel this build}"/>
</j:if> </j:if>
</div> </div>
</div> </div>

2
core/src/main/resources/lib/hudson/queue.jelly
View File

@ -93,7 +93,7 @@ THE SOFTWARE.
</td> </td>
<td class="pane" width="16" align="center" valign="middle"> <td class="pane" width="16" align="center" valign="middle">
<j:if test="${item.hasCancelPermission()}"> <j:if test="${item.hasCancelPermission()}">
<l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" confirm="${%confirm(item.displayName)}" alt="${%cancel this build}"/> <l:stopButton href="${rootURL}/queue/cancelItem?id=${item.id}" confirm="${%confirm(item.displayName)}" alt="${%Cancel this build}"/>
</j:if> </j:if>
</td> </td>
</tr> </tr>

2
test/pom.xml
View File

@ -105,7 +105,7 @@ THE SOFTWARE.
<!-- requireUpperBoundDeps via matrix-project and junit --> <!-- requireUpperBoundDeps via matrix-project and junit -->
<groupId>org.jenkins-ci.plugins</groupId> <groupId>org.jenkins-ci.plugins</groupId>
<artifactId>script-security</artifactId> <artifactId>script-security</artifactId>
<version>1294.v99333c047434</version> <version>1305.v487433146192</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.jenkins-ci.plugins.workflow</groupId> <groupId>org.jenkins-ci.plugins.workflow</groupId>