p85947160
/
Gitee-Jenkins-Plugin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #124 from jsyrjala/auto-accept-merge-request-default 

Fix acceptMergeRequestOnSuccess configuration. Thanks!
This commit is contained in:
Owen Mehegan 2015-11-02 17:26:24 -08:00
parent 3634056eb9 f933c79b17
commit b650d88d45
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/dabsquared/gitlabjenkins/GitLabPushTrigger.java
View File

@ -128,6 +128,10 @@ public class GitLabPushTrigger extends Trigger<Job<?, ?>> {
return addVoteOnMergeRequest;
}
public boolean getAcceptMergeRequestOnSuccess() {
return acceptMergeRequestOnSuccess;
}
public boolean getAllowAllBranches() {
return allowAllBranches;
}

2
src/main/resources/com/dabsquared/gitlabjenkins/GitLabPushTrigger/config.jelly
View File

@ -22,7 +22,7 @@
<f:checkbox default="true" />
</f:entry>
<f:entry title="Accept merge request on success" field="acceptMergeRequestOnSuccess">
<f:checkbox default="true" />
<f:checkbox default="false" />
</f:entry>
<f:entry title="All allow all branches (Ignoring Filtered Branches)" field="allowAllBranches">
<f:checkbox default="false" />