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
9 changes: 9 additions & 0 deletions src/main/java/org/gitlab4j/api/models/MergeRequest.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public class MergeRequest {
private String mergeError;
private Milestone milestone;
private Pipeline pipeline;
private Pipeline headPipeline;
private Long projectId;
private String sha;
private Boolean shouldRemoveSourceBranch;
Expand Down Expand Up @@ -329,6 +330,14 @@ public void setPipeline(Pipeline pipeline) {
this.pipeline = pipeline;
}

public Pipeline getHeadPipeline() {
return headPipeline;
}

public void setHeadPipeline(Pipeline headPipeline) {
this.headPipeline = headPipeline;
}

public Long getProjectId() {
return projectId;
}
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/gitlab4j/api/models/Pipeline.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
public class Pipeline {

private Long id;
private Long projectId;
private PipelineStatus status;
private String ref;
private String sha;
Expand All @@ -33,6 +34,14 @@ public void setId(Long id) {
this.id = id;
}

public Long getProjectId() {
return projectId;
}

public void setProjectId(Long projectId) {
this.projectId = projectId;
}

public PipelineStatus getStatus() {
return status;
}
Expand Down
31 changes: 30 additions & 1 deletion src/test/resources/org/gitlab4j/api/merge-request.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,34 @@
"blocking_discussions_resolved": true,
"diverged_commits_count": 2,
"latest_build_started_at": "2018-09-07T07:27:38.472Z",
"latest_build_finished_at": "2018-09-07T08:07:06.012Z"
"latest_build_finished_at": "2018-09-07T08:07:06.012Z",
"head_pipeline": {
"id": 1,
"project_id": 3,
"sha": "2be7ddb704c7b6b83732fdd5b9f09d5a397b5f8f",
"ref": "test1",
"status": "pending",
"created_at": "2018-09-07T07:27:38.472Z",
"updated_at": "2018-09-07T07:27:38.472Z",
"web_url": "https://www.google.com/",
"before_sha": "0000000000000000000000000000000000000000",
"tag": false,
"user": {
"id":1,
"username": "admin",
"state": "active",
"email":"admin@local.host",
"name":"Administrator"
},
"detailed_status": {
"icon": "status_pending",
"text": "pending",
"label": "pending",
"group": "pending",
"tooltip": "pending",
"has_details": true,
"details_path": "/my-group/my-project/-/pipelines/1",
"favicon": "https://www.google.com/"
}
}
}