Skip to content
Permalink
Browse files

[FIXED JENKINS-10270] Merge options persist properly now.

  • Loading branch information...
abayer committed Jul 15, 2011
1 parent b3ea09e commit 200c8d931d0a8cd9f93d1e452bcbc1c70e147e25
Showing with 3 additions and 3 deletions.
  1. +3 −3 src/main/resources/hudson/plugins/git/GitSCM/config.jelly
@@ -123,16 +123,16 @@
<table width="100%">
<f:optionalBlock field="doMerge"
title="${%Merge before build}"
checked="${doMerge}">
checked="${scm.mergeOptions.doMerge()}">
<f:entry title="Name of repository: (default first specified, e.g. origin)" field="mergeRemote">
<f:textbox id="git.mergeRemote" />
<f:textbox id="git.mergeRemote" value="${scm.mergeOptions.getMergeRemote().getName()}"/>
<!-- 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&amp;value='+escape(this.value)
+encodeAllInputs('&amp;', this.form, 'repo.name')
+encodeAllInputs('&amp;', this.form, 'repo.url')"/ -->
</f:entry>
<f:entry title="Branch to merge to: (e.g. master)" field="mergeTarget">
<f:textbox id="git.mergeTarget" clazz="required"/>
<f:textbox id="git.mergeTarget" value="${scm.mergeOptions.getMergeTarget()}" clazz="required"/>
</f:entry>
</f:optionalBlock>
</table>

0 comments on commit 200c8d9

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