Fix merge bug

Author: lunny

models/issues/pull_list.go

@@ -69,11 +69,11 @@ func CanUserWriteToBranch(ctx context.Context, p access_model.Permission, headRe
 		return true
 	}
 
-	return canMaintainerWriteToHeadBranch(ctx, headRepoID, branch, user)
+	return CanMaintainerWriteToHeadBranch(ctx, headRepoID, branch, user)
 }
 
-// canMaintainerWriteToHeadBranch check whether user is a maintainer and could write to the branch
-func canMaintainerWriteToHeadBranch(ctx context.Context, headRepoID int64, branch string, user *user_model.User) bool {
+// CanMaintainerWriteToHeadBranch check whether user is a maintainer and could write to the branch
+func CanMaintainerWriteToHeadBranch(ctx context.Context, headRepoID int64, branch string, user *user_model.User) bool {
 	prs, err := GetUnmergedPullRequestsByHeadInfo(ctx, headRepoID, branch)
 	if err != nil {
 		log.Error("GetUnmergedPullRequestsByHeadInfo: %v", err)

services/context/repo.go

@@ -1027,7 +1027,7 @@ func GitHookService() func(ctx *Context) {
 // canWriteAsMaintainer check if the doer can write to a branch as a maintainer
 func canWriteAsMaintainer(ctx *Context) bool {
 	branchName := getRefNameFromPath(ctx.Repo, ctx.PathParam("*"), func(branchName string) bool {
-		return issues_model.CanMaintainerWriteToBranch(ctx, ctx.Repo.Permission, branchName, ctx.Doer)
+		return issues_model.CanMaintainerWriteToHeadBranch(ctx, ctx.Repo.Repository.ID, branchName, ctx.Doer)
 	})
 	return len(branchName) > 0
 }