Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[FIXED JENKINS-9914] Using proper databinding scheme and adding help …
…for these fields.
- Loading branch information
Showing
10 changed files
with
53 additions
and
31 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
12 changes: 12 additions & 0 deletions
12
src/main/resources/hudson/plugins/git/UserMergeOptions/config.jelly
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
<j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form"> | ||
<f:entry title="Name of repository" field="mergeRemote"> | ||
<f:textbox id="git.mergeRemote" /> | ||
<!-- TODO add the check url. Note that we cannot rely on the repo.name tag to be at the root of the form --> | ||
<!-- checkUrl="'${rootURL}/scm/GitSCM/gitRemoteNameCheck?isMerge=true&value='+escape(this.value) | ||
+encodeAllInputs('&', this.form, 'repo.name') | ||
+encodeAllInputs('&', this.form, 'repo.url')"/ --> | ||
</f:entry> | ||
<f:entry title="${%Branch to merge to}" field="mergeTarget"> | ||
<f:textbox id="git.mergeTarget" clazz="required"/> | ||
</f:entry> | ||
</j:jelly> |
4 changes: 4 additions & 0 deletions
4
src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeRemote.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,4 @@ | ||
<div> | ||
Name of the repository, such as <tt>origin</tt>, that contains the branch you specify below. If left blank, | ||
it'll default to the name of the first repository configured above. | ||
</div> |
3 changes: 3 additions & 0 deletions
3
src/main/resources/hudson/plugins/git/UserMergeOptions/help-mergeTarget.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
<div> | ||
The name of the branch within the named repository to merge to, such as <tt>master</tt>. | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
<div> | ||
Specify the branch name if you'd like to track a specific branch in a repository. If left blank, all branches will be examined for changes and built. | ||
Specify the branches if you'd like to track a specific branch in a repository. If left blank, all branches will be examined for changes and built. | ||
The syntax is <tt>REPOSITORYNAME/</tt> | ||
</div> |