更改:rebase develop

This commit is contained in:
yystopf 2023-11-23 09:06:41 +08:00
parent 3389735752
commit b35950299b
2 changed files with 1 additions and 5 deletions

View File

@ -151,7 +151,7 @@ func GetPaginateCodeAuthors(repo *gitea_git.Repository, fromTime time.Time, bran
var authors []*CodeActivityAuthor
since := fromTime.Format(time.RFC3339)
authorCmd := gitea_git.NewCommand(repo.Ctx, "log", "--no-merges", "--format=%aN <%aE>", "--date=iso", gitea_git.CmdArg(fmt.Sprintf("--since='%s'", since)))
authorCmd := gitea_git.NewCommand(repo.Ctx, "log", "--no-merges", "--format=%aN <%aE>", "--date=iso").AddDynamicArguments(fmt.Sprintf("--since='%s'", since))
if len(branch) == 0 {
authorCmd.AddArguments("--branches=*")
} else {

View File

@ -88,8 +88,6 @@ func GetAllCommitsSliceByTime(ctx *context.APIContext) {
apiCommits := make([]*responseCommit, len(commits))
apiCommitsList := []responseCommit{}
stat := ctx.FormString("stat") == "" || ctx.FormBool("stat")
for i, commitPoniter := range commits {
apiCommits[i], err = toResponseCommit(ctx, ctx.Repo.Repository, gitRepo, commitPoniter, userCache, convert.ParseCommitOptions(ctx))
if err != nil {
@ -193,8 +191,6 @@ func GetFileAllCommits(ctx *context.APIContext) {
userCache := make(map[string]*user_model.User)
apiCommits := make([]*api.Commit, len(commits))
stat := ctx.FormString("stat") == "" || ctx.FormBool("stat")
for i, commit := range commits {
apiCommits[i], err = convert.ToCommit(ctx, ctx.Repo.Repository, ctx.Repo.GitRepo, commit, userCache, convert.ParseCommitOptions(ctx))
if err != nil {