未验证 提交 0e974ef2 编写于 作者: A Alexander Brandes 提交者: GitHub

Merge pull request #7590 from NotMyFault/backporting-for-2.375.3

Backporting for 2.375.3
......@@ -2,14 +2,12 @@
# JENKINS-28942 could make this obsolete.
credentials matrix-auth
credentials windows-slaves
script-security antisamy-markup-formatter
script-security bouncycastle-api
script-security command-launcher
script-security matrix-auth
script-security matrix-project
script-security windows-slaves
# Weird unexpected cycle that showed up during testing of this new plugin
# so breaking all potential cycles until JENKINS-28942
......@@ -25,7 +23,6 @@ ldap jaxb
pam-auth jaxb
mailer jaxb
matrix-auth jaxb
windows-slaves jaxb
antisamy-markup-formatter jaxb
matrix-project jaxb
junit jaxb
......
......@@ -16,7 +16,6 @@ ldap 1.467 1.0
pam-auth 1.467 1.0
mailer 1.493 1.2
matrix-auth 1.535 1.0.2
windows-slaves 1.547 1.0
antisamy-markup-formatter 1.553 1.0
matrix-project 1.561 1.0
junit 1.577 1.0
......
......@@ -43,7 +43,7 @@ THE SOFTWARE.
</st:documentation>
<j:if test="${mode=='breadcrumbs'}">
<j:set var="hasLink" value="${!(attrs.href == null or h.hyperlinkMatchesCurrentPage(attrs.href))}" />
<j:set var="hasLink" value="${attrs.href != null}" />
<li id="${attrs.id}" class="jenkins-breadcrumbs__list-item" aria-current="${hasLink ? null : 'page'}">
<j:choose>
<j:when test="${!hasLink}">
......
......@@ -47,7 +47,7 @@ THE SOFTWARE.
<j:if test="${h.isModel(anc.object) and anc.prev.url!=anc.url}">
<j:set var="mode" value="breadcrumbs" />
<l:breadcrumb title="${anc.object == app ? '%Dashboard' : anc.object.displayName}"
href="${contents.length() == 0 and (index == request.ancestors.size() - 1) ? null : anc.url + '/'}"
href="${anc.url}/"
hasMenu="${h.isModelWithContextMenu(anc.object)}" />
<j:choose>
<j:when test="${h.isModelWithChildren(anc.object)}">
......
......@@ -301,12 +301,6 @@ THE SOFTWARE.
<version>2.6.6</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>windows-slaves</artifactId>
<version>1.8.1</version>
<type>hpi</type>
</artifactItem>
<artifactItem>
<groupId>org.jenkins-ci.plugins</groupId>
<artifactId>antisamy-markup-formatter</artifactId>
......
......@@ -54,7 +54,6 @@ html {
// The downside is that the page does not resize with the browser's font size,
// only with the zoom level.
font-size: 16px !important;
letter-spacing: -0.016em;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
-webkit-tap-highlight-color: transparent;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册