Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Clarify safe restart won't wait for Pipeline jobs #7091

Merged
merged 3 commits into from
Oct 15, 2022
Merged

Clarify safe restart won't wait for Pipeline jobs #7091

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4bf1155
Clarify safe restart won't wait for Pipeline jobs
omehegan Sep 12, 2022
8476e56
Update core/src/main/resources/jenkins/model/Jenkins/_safeRestart.jelly
omehegan Oct 12, 2022
b00290e
Update core/src/main/resources/jenkins/model/Jenkins/_api.jelly
omehegan Oct 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/src/main/resources/jenkins/model/Jenkins/_api.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ THE SOFTWARE.
You can cancel this mode by sending a POST request to <a href="../cancelQuietDown">this URL</a>. On environments
where Jenkins can restart itself (such as when Jenkins is installed as a Windows service), POSTing to
<a href="../restart">this URL</a> will start the restart sequence, or
<a href="../safeRestart">this URL</a> to restart once no jobs are running.
<a href="../safeRestart">this URL</a> to restart once no jobs (Pipeline jobs excepted) are running.
omehegan marked this conversation as resolved.
Show resolved Hide resolved
All these URLs need Overall/Manage permission (typically granted via Overall/Administer).
</p>
</j:jelly>
2 changes: 1 addition & 1 deletion core/src/main/resources/jenkins/model/Jenkins/_safeRestart.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ THE SOFTWARE.
<j:choose>
<j:when test="${app.lifecycle.canRestart()}">
<form method="post" action="safeRestart">
${%Are you sure you want to restart Jenkins? Jenkins will restart once all running jobs are finished.}
${%Are you sure you want to restart Jenkins? Jenkins will restart once all running jobs (Pipeline jobs excepted) are finished.}
omehegan marked this conversation as resolved.
Show resolved Hide resolved
<f:submit value="${%Yes}" />
</form>
</j:when>
Expand Down