mirror of
https://github.com/jenkinsci/jenkins.git
synced 2026-11-18 06:22:29 +00:00
Merge branch 'master' of git://github.com/jenkinsci/jenkins
This commit is contained in:
commit
5fc7e3ea2d
4 files changed
+15
-5
No files matched your search
@@ -55,6 +55,9 @@ Upcoming changes</a>
|
||||
<!-- Record your changes in the trunk here. -->
|
||||
<div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
|
||||
<ul class=image>
|
||||
<li class="bug">
|
||||
Worked around "incompatible InnerClasses attribute" bug in IBM J9 VM
|
||||
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-22525">issue 22525</a>)
|
||||
<li class="bug">
|
||||
Fixed a file descriptor leak with CLI connections.
|
||||
(<a href="https://issues.jenkins-ci.org/browse/JENKINS-23248">issue 23248</a>)
|
||||
|
||||
+1
-1
@@ -179,7 +179,7 @@ THE SOFTWARE.
|
||||
<dependency>
|
||||
<groupId>com.infradna.tool</groupId>
|
||||
<artifactId>bridge-method-annotation</artifactId>
|
||||
<version>1.9</version>
|
||||
<version>1.13</version>
|
||||
</dependency>
|
||||
|
||||
<dependency><!-- until we get this version through Stapler -->
|
||||
|
||||
@@ -114,10 +114,10 @@ THE SOFTWARE.
|
||||
<span>
|
||||
<j:choose>
|
||||
<j:when test="${iconMetadata != null}">
|
||||
<l:icon class="${iconMetadata.classSpec}"/>
|
||||
<l:icon class="${iconMetadata.classSpec}" style="width: 24px; height: 24px; margin: 2px;" />
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<l:icon width="24" height="24" style="margin: 2px;" alt="" src="${icon}"/>
|
||||
<l:icon alt="" src="${icon}" style="width: 24px; height: 24px; margin: 2px;" />
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
</span>
|
||||
@@ -137,7 +137,14 @@ THE SOFTWARE.
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
<div class="task">
|
||||
${taskTags!=null and attrs.contextMenu!='false' ? taskTags.add(href, icon, title, post == 'true', requiresConfirmation == 'true') : null}
|
||||
<j:choose>
|
||||
<j:when test="${iconMetadata != null}">
|
||||
${taskTags!=null and attrs.contextMenu!='false' ? taskTags.add(href, iconMetadata.getQualifiedUrl(context), title, post == 'true', requiresConfirmation == 'true') : null}
|
||||
</j:when>
|
||||
<j:otherwise>
|
||||
${taskTags!=null and attrs.contextMenu!='false' ? taskTags.add(href, icon, title, post == 'true', requiresConfirmation == 'true') : null}
|
||||
</j:otherwise>
|
||||
</j:choose>
|
||||
|
||||
<j:set var="id" value="${h.generateId()}"/>
|
||||
<j:if test="${attrs.onclick == null and post and not requiresConfirmation}">
|
||||
|
||||
Reference in new issue
Block a user