sim1222-mirror/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-08-22 16:44:06 +09:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/bots

Browse Source
This commit is contained in:
Jason Song
2023-01-09 12:17:08 +08:00
committed by GitHub
parent 5e9d4f7b9c 7adc2de464
commit f414fd6141
41 changed files with 179 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/context/repo.go
View File

@ -126,7 +126,7 @@ func (r *Repository) CanCommitToBranch(ctx context.Context, doer *user_model.Use
userCanPush := true
requireSigned := false
if protectedBranch != nil {
userCanPush = protectedBranch.CanUserPush(doer.ID)
userCanPush = protectedBranch.CanUserPush(ctx, doer.ID)
requireSigned = protectedBranch.RequireSignedCommits
}
@ -831,7 +831,7 @@ func getRefName(ctx *Context, pathType RepoRefType) string {
if len(ref) == 0 {
// maybe it's a renamed branch
return getRefNameFromPath(ctx, path, func(s string) bool {
b, exist, err := git_model.FindRenamedBranch(ctx.Repo.Repository.ID, s)
b, exist, err := git_model.FindRenamedBranch(ctx, ctx.Repo.Repository.ID, s)
if err != nil {
log.Error("FindRenamedBranch", err)
return false