opensource/gitea
1
0
Fork 0
mirror of https://gitcode.com/gitea/gitea.git synced 2025-06-27 23:49:44 +08:00
Code Issues Packages Projects Releases Wiki Activity

Re-work MAX_DIFF_LINES: supress diff per file, not the whole diff (#3174)

Browse Source
This commit is contained in:
Andrey Nering
2016-06-29 12:11:00 -03:00
committed by 无闻
parent 84841c8c4b
commit 743d22669a
7 changed files with 164 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
routers/repo/pull.go
View File

@ -348,7 +348,8 @@ func ViewPullFiles(ctx *context.Context) {
}
diff, err := models.GetDiffRange(diffRepoPath,
startCommitID, endCommitID, setting.Git.MaxGitDiffLines)
startCommitID, endCommitID, setting.Git.MaxGitDiffLines,
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
if err != nil {
ctx.Handle(500, "GetDiffRange", err)
return
@ -545,7 +546,8 @@ func PrepareCompareDiff(
}
diff, err := models.GetDiffRange(models.RepoPath(headUser.Name, headRepo.Name),
prInfo.MergeBase, headCommitID, setting.Git.MaxGitDiffLines)
prInfo.MergeBase, headCommitID, setting.Git.MaxGitDiffLines,
setting.Git.MaxGitDiffLineCharacters, setting.Git.MaxGitDiffFiles)
if err != nil {
ctx.Handle(500, "GetDiffRange", err)
return false