Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public void isMatch() {
continue;
}
if (gitLabSCMSource.getProjectId() == getPayload().getMergeRequest()
.getTargetProjectId() && isTrustedMember(gitLabSCMSource, sourceContext.onlyTrustedMembersCanTrigger())) {
.getTargetProjectId() && isTrustedMember(gitLabSCMSource, sourceContext.getOnlyTrustedMembersCanTrigger())) {
for (Job<?, ?> job : owner.getAllJobs()) {
if (mergeRequestJobNamePattern.matcher(job.getName()).matches()) {
String expectedCommentBody = sourceContext.getCommentBody();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ public final boolean mrCommentTriggerEnabled() {
return mrCommentTriggerEnabled;
}

public final boolean onlyTrustedMembersCanTrigger() { return onlyTrustedMembersCanTrigger; }
public final boolean getOnlyTrustedMembersCanTrigger() { return onlyTrustedMembersCanTrigger; }

public final String getCommentBody() {
return commentBody;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,18 +22,18 @@ public class TriggerMRCommentTrait extends SCMSourceTrait {
/**
* Only comment trigger by trusted members only (members having access to project)
*/
private final boolean onlyTrustedMembers;
private final boolean onlyTrustedMembersCanTrigger;

/**
* Constructor.
*
* @param commentBody the comment body to trigger a new build on
* @param onlyTrustedMembers
* @param onlyTrustedMembersCanTrigger
*/
@DataBoundConstructor
public TriggerMRCommentTrait(String commentBody, boolean onlyTrustedMembers) {
public TriggerMRCommentTrait(String commentBody, boolean onlyTrustedMembersCanTrigger) {
this.commentBody = commentBody;
this.onlyTrustedMembers = onlyTrustedMembers;
this.onlyTrustedMembersCanTrigger = onlyTrustedMembersCanTrigger;
}

/**
Expand All @@ -48,14 +48,24 @@ public String getCommentBody() {
return commentBody;
}

/**
* Allow trigger a new build by trusted members only.
*
* @return true if allow trusted members only
* @since TODO
*/
public boolean getOnlyTrustedMembersCanTrigger() {
return onlyTrustedMembersCanTrigger;
}

/**
* {@inheritDoc}
*/
@Override
protected void decorateContext(SCMSourceContext<?, ?> context) {
GitLabSCMSourceContext ctx = (GitLabSCMSourceContext) context;
ctx.withMRCommentTriggerEnabled(true);
ctx.withOnlyTrustedMembersCanTrigger(onlyTrustedMembers);
ctx.withOnlyTrustedMembersCanTrigger(getOnlyTrustedMembersCanTrigger());
ctx.withCommentBody(getCommentBody());
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<f:entry title="${%Comment Body}" field="commentBody">
<f:textbox default="jenkins rebuild"/>
</f:entry>
<f:entry title="${%Enable triggers by Trusted Members only}" field="onlyTrustedMembers">
<f:entry title="${%Enable triggers by Trusted Members only}" field="onlyTrustedMembersCanTrigger">
<f:checkbox default="true"/>
</f:entry>
</j:jelly>