Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
J
java-gitlab-api
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
沈俊林
java-gitlab-api
Commits
32eb941b
Commit
32eb941b
authored
May 24, 2017
by
Cédric Tabin
Committed by
Tim Olshansky
May 24, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add missing field mergeCommitSHA and json property SHA (#212)
parent
5b99e864
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
3 deletions
+18
-3
GitlabMergeRequest.java
src/main/java/org/gitlab/api/models/GitlabMergeRequest.java
+18
-3
No files found.
src/main/java/org/gitlab/api/models/GitlabMergeRequest.java
View file @
32eb941b
...
...
@@ -49,6 +49,8 @@ public class GitlabMergeRequest {
@JsonProperty
(
"created_at"
)
private
Date
createdAt
;
@JsonProperty
(
"merge_commit_sha"
)
private
String
mergeCommitSHA
;
@JsonProperty
(
"merge_status"
)
private
String
mergeStatus
;
...
...
@@ -56,6 +58,7 @@ public class GitlabMergeRequest {
@JsonProperty
(
"web_url"
)
private
String
webUrl
;
@JsonProperty
(
"sha"
)
private
String
sha
;
public
Integer
getId
()
{
...
...
@@ -244,9 +247,21 @@ public class GitlabMergeRequest {
this
.
changes
=
changes
;
}
public
String
getMergeStatus
()
{
return
mergeStatus
;
}
public
String
getMergeCommitSHA
()
{
return
mergeCommitSHA
;
}
public
void
setMergeCommitSHA
(
String
mergeCommitSHA
)
{
this
.
mergeCommitSHA
=
mergeCommitSHA
;
}
public
void
setMergeStatus
(
String
mergeStatus
)
{
this
.
mergeStatus
=
mergeStatus
;
}
public
String
getMergeStatus
()
{
return
mergeStatus
;
}
public
void
setMergeStatus
(
String
mergeStatus
)
{
this
.
mergeStatus
=
mergeStatus
;
}
public
String
getWebUrl
()
{
return
webUrl
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment