Skip to content
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.

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

Add id to ProtectedBranch and BranchAccessLevel #901

Merged
merged 1 commit into from
Feb 5, 2023
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/BranchAccessLevel.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,20 @@

public class BranchAccessLevel {

private Long id;
private AccessLevel accessLevel;
private String accessLevelDescription;
private Long userId;
private Long groupId;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public AccessLevel getAccessLevel() {
return this.accessLevel;
}
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/org/gitlab4j/api/models/ProtectedBranch.java
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@

public class ProtectedBranch {

private Long id;
private String name;
private List<BranchAccessLevel> pushAccessLevels;
private List<BranchAccessLevel> mergeAccessLevels;
private List<BranchAccessLevel> unprotectAccessLevels;
private Boolean codeOwnerApprovalRequired;

public Long getId() {
return id;
}

public void setId(Long id) {
this.id = id;
}

public String getName() {
return this.name;
}
Expand Down
3 changes: 3 additions & 0 deletions src/test/resources/org/gitlab4j/api/protected-branch.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"id": 457,
"name": "develop",
"push_access_levels": [
{
"id": 123,
"access_level": 40,
"access_level_description": "Masters"
},
Expand All @@ -11,6 +13,7 @@
],
"merge_access_levels": [
{
"id": 789,
"access_level": 40,
"access_level_description": "Masters"
},
Expand Down