Skip to content
Permalink
Browse files

Merge pull request #1953 from daniel-beck/JENKINS-11016

[FIX JENKINS-11016] Add button that allows retrying core update
  • Loading branch information...
daniel-beck committed Dec 17, 2015
2 parents 9339a34 + e539198 commit 9a546233ab942b99e731c23cb3c0b67dcea0c122
@@ -24,4 +24,5 @@ NewVersionAvailable=New version of Jenkins ({0}) is available for <a href="{1}">
(<a href="${changelog.url}">changelog</a>).
UpgradeComplete=Upgrade to Jenkins {0} is complete, awaiting <a href="{1}/safeRestart">restart</a>.
UpgradeCompleteRestartNotSupported=Upgrade to Jenkins {0} is complete, awaiting restart.
UpgradeProgress=Upgrade to Jenkins {0} is <a href="{1}">in progress or failed</a>.
UpgradeProgress=Upgrade to Jenkins {0} is <a href="{1}">in progress</a>.
UpgradeFailed=Upgrade to Jenkins {0} failed: <a href="{2}">{1}</a>.
@@ -39,6 +39,14 @@ THE SOFTWARE.
</j:otherwise>
</j:choose>
</j:when>
<j:when test="${upJob!=null and upJob.error != null}">
<form method="post" action="${rootURL}/updateCenter/upgrade">
${%UpgradeFailed(ucData.core.version,upJob.errorMessage,rootURL+'/updateCenter/')}
<j:if test="${ucData.canUpgrade()}">
<f:submit value="${%Retry}"/>
</j:if>
</form>
</j:when>
<j:when test="${upJob!=null}">
${%UpgradeProgress(ucData.core.version,rootURL+'/updateCenter/')}
</j:when>

0 comments on commit 9a54623

Please sign in to comment.
You can’t perform that action at this time.