|
|
@ -431,11 +431,15 @@ func PrepareCompareDiff(
|
|
|
|
ctx.Data["IsNothingToCompare"] = true
|
|
|
|
ctx.Data["IsNothingToCompare"] = true
|
|
|
|
if unit, err := repo.GetUnit(models.UnitTypePullRequests); err == nil {
|
|
|
|
if unit, err := repo.GetUnit(models.UnitTypePullRequests); err == nil {
|
|
|
|
config := unit.PullRequestsConfig()
|
|
|
|
config := unit.PullRequestsConfig()
|
|
|
|
|
|
|
|
|
|
|
|
if !config.AutodetectManualMerge {
|
|
|
|
if !config.AutodetectManualMerge {
|
|
|
|
ctx.Data["AllowEmptyPr"] = !(baseBranch == headBranch && ctx.Repo.Repository.Name == headRepo.Name)
|
|
|
|
allowEmptyPr := !(baseBranch == headBranch && ctx.Repo.Repository.Name == headRepo.Name)
|
|
|
|
} else {
|
|
|
|
ctx.Data["AllowEmptyPr"] = allowEmptyPr
|
|
|
|
ctx.Data["AllowEmptyPr"] = false
|
|
|
|
|
|
|
|
|
|
|
|
return !allowEmptyPr
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
ctx.Data["AllowEmptyPr"] = false
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return true
|
|
|
|
return true
|
|
|
|
}
|
|
|
|
}
|
|
|
|