Skip to content

Fix #323 merge_commit_sha field is missing in merge request event #324

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

Merged
merged 2 commits into from
Apr 4, 2019
Merged

Fix #323 merge_commit_sha field is missing in merge request event #324

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6a035f
Added EventMergeRequest.mergeCommitSha field (#323)
lesiak Mar 25, 2019
0e2231f
Optimized imports in WebHookListener
lesiak Mar 25, 2019
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
9 changes: 9 additions & 0 deletions src/main/java/org/gitlab4j/api/webhook/EventMergeRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ public class EventMergeRequest {
private String description;
private Integer id;
private Integer iid;
private String mergeCommitSha;
private String mergeStatus;
private Integer milestoneId;
private Integer position;
Expand Down Expand Up @@ -97,6 +98,14 @@ public void setIid(Integer iid) {
this.iid = iid;
}

public String getMergeCommitSha() {
return mergeCommitSha;
}

public void setMergeCommitSha(String mergeCommitSha) {
this.mergeCommitSha = mergeCommitSha;
}

public String getMergeStatus() {
return this.mergeStatus;
}
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/gitlab4j/api/webhook/WebHookListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@

package org.gitlab4j.api.webhook;

import org.gitlab4j.api.webhook.IssueEvent;
import org.gitlab4j.api.webhook.MergeRequestEvent;
import org.gitlab4j.api.webhook.PushEvent;

/**
* This interface defines an event listener for the event fired when
* a WebHook notification has been received from a GitLab server.
Expand Down
1 change: 1 addition & 0 deletions src/test/resources/org/gitlab4j/api/merge-request-event.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
"merge_status": "unchecked",
"target_project_id": 14,
"iid": 1,
"merge_commit_sha": "5f72688f7af57df23ee7510cec59b909289964f1",
"description": "",
"source":{
"name":"Awesome Project",
Expand Down