Skip to content

[JENKINS-40566] Allow collaborators to cancel/abort a build #81

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 1 commit into from
Apr 29, 2017
Merged

[JENKINS-40566] Allow collaborators to cancel/abort a build #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/main/java/org/jenkinsci/plugins/GithubRequireOrganizationMembershipACL.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@ public boolean hasRepositoryPermission(GithubAuthenticationToken authenticationT
if (permission.equals(Item.READ) ||
permission.equals(Item.CONFIGURE) ||
permission.equals(Item.DELETE) ||
permission.equals(Item.EXTENDED_READ)) {
permission.equals(Item.EXTENDED_READ) ||
permission.equals(Item.CANCEL)) {
return true;
} else {
return false;
Expand Down
4 changes: 2 additions & 2 deletions src/main/webapp/help/auth/use-repository-permissions-help.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div>
If checked will use github repository permissions to determine jenkins permissions for each project.
<ul>
<li>Public projects - all authenticated users can READ. Only collaborators can BUILD, EDIT, CONFIGURE or DELETE.
<li>Private projects, only collaborators can READ, BUILD, EDIT, CONFIGURE or DELETE
<li>Public projects - all authenticated users can READ. Only collaborators can BUILD, EDIT, CONFIGURE, CANCEL or DELETE.
<li>Private projects, only collaborators can READ, BUILD, EDIT, CONFIGURE, CANCEL or DELETE
</ul>
</div>
2 changes: 2 additions & 0 deletions src/test/java/org/jenkinsci/plugins/GithubRequireOrganizationMembershipACLTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,7 @@ public void testCanReadConfigureDeleteAProjectWithAuthenticatedUserReadPermissio
assertTrue(acl.hasPermission(authenticationToken, Item.CONFIGURE));
assertTrue(acl.hasPermission(authenticationToken, Item.DELETE));
assertTrue(acl.hasPermission(authenticationToken, Item.EXTENDED_READ));
assertTrue(acl.hasPermission(authenticationToken, Item.CANCEL));
}

@Test
Expand All @@ -480,6 +481,7 @@ public void testCannotReadConfigureDeleteAProjectWithoutToAuthenticatedUserReadP
assertFalse(acl.hasPermission(authenticationToken, Item.CONFIGURE));
assertFalse(acl.hasPermission(authenticationToken, Item.DELETE));
assertFalse(acl.hasPermission(authenticationToken, Item.EXTENDED_READ));
assertFalse(acl.hasPermission(authenticationToken, Item.CANCEL));
}

@Test
Expand Down