Skip to content

Commit 4ac5e9c

Browse files
committed
Merge remote-tracking branch 'origin/main' into 6.x
2 parents cbc27b6 + 6c06521 commit 4ac5e9c

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Diff for: src/main/java/org/gitlab4j/api/systemhooks/TeamMemberSystemHookEvent.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public class TeamMemberSystemHookEvent extends AbstractSystemHookEvent {
1414
private Date createdAt;
1515
private Date updatedAt;
1616
private String eventName;
17-
private String projectAccess;
17+
private String accessLevel;
1818
private String projectName;
1919
private String projectPath;
2020
private Long projectId;
@@ -50,12 +50,12 @@ public void setEventName(String eventName) {
5050
this.eventName = eventName;
5151
}
5252

53-
public String getProjectAccess() {
54-
return projectAccess;
53+
public String getAccessLevel() {
54+
return accessLevel;
5555
}
5656

57-
public void setProjectAccess(String projectAccess) {
58-
this.projectAccess = projectAccess;
57+
public void setAccessLevel(String accessLevel) {
58+
this.accessLevel = accessLevel;
5959
}
6060

6161
public String getProjectName() {

Diff for: src/test/resources/org/gitlab4j/api/team-member-system-hook-event.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"created_at": "2012-07-21T07:30:56Z",
33
"updated_at": "2012-07-21T07:38:22Z",
44
"event_name": "user_add_to_team",
5-
"project_access": "Master",
5+
"access_level": "Master",
66
"project_id": 74,
77
"project_name": "StoreCloud",
88
"project_path": "storecloud",

0 commit comments

Comments
 (0)