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

Allow forks to org if you can create repos #17783

Merged
merged 8 commits into from
Nov 25, 2021
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
2 changes: 1 addition & 1 deletion models/repo.go
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ func CanUserForkRepo(user *user_model.User, repo *Repository) (bool, error) {
if repo.OwnerID != user.ID && !HasForkedRepo(user.ID, repo.ID) {
return true, nil
}
ownedOrgs, err := GetOwnedOrgsByUserID(user.ID)
ownedOrgs, err := GetOrgsCanCreateRepoByUserID(user.ID)
if err != nil {
return false, err
}
Expand Down
12 changes: 6 additions & 6 deletions routers/web/repo/pull.go
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@ func getForkRepository(ctx *context.Context) *models.Repository {

ctx.Data["ForkRepo"] = forkRepo

ownedOrgs, err := models.GetOwnedOrgsByUserID(ctx.User.ID)
ownedOrgs, err := models.GetOrgsCanCreateRepoByUserID(ctx.User.ID)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is an performance regression for all pages with fork button. This should be fixed in v1.16.

if err != nil {
ctx.ServerError("GetOwnedOrgsByUserID", err)
ctx.ServerError("GetOrgsCanCreateRepoByUserID", err)
return nil
}
var orgs []*models.Organization
Expand Down Expand Up @@ -216,13 +216,13 @@ func ForkPost(ctx *context.Context) {
}
}

// Check ownership of organization.
// Check if user is allowed to create repo's on the organization.
if ctxUser.IsOrganization() {
isOwner, err := models.OrgFromUser(ctxUser).IsOwnedBy(ctx.User.ID)
isAllowedToFork, err := models.OrgFromUser(ctxUser).CanCreateOrgRepo(ctx.User.ID)
if err != nil {
ctx.ServerError("IsOwnedBy", err)
ctx.ServerError("CanCreateOrgRepo", err)
return
} else if !isOwner {
} else if !isAllowedToFork {
ctx.Error(http.StatusForbidden)
return
}
Expand Down