cleanup

models/branches.go

@@ -197,13 +197,7 @@ func (protectBranch *ProtectedBranch) MergeBlockedByRejectedReview(pr *PullReque
 
 // MergeBlockedByOutdatedBranch returns true if merge is blocked by an outdated head branch
 func (protectBranch *ProtectedBranch) MergeBlockedByOutdatedBranch(pr *PullRequest) bool {
- if !protectBranch.BlockOnOutdatedBranch {
- return false
- }
- if pr.CommitsBehind == 0 {
- return false
- }
- return true
+ return protectBranch.BlockOnOutdatedBranch && pr.CommitsBehind > 0
 }
 
 // GetProtectedFilePatterns parses a semicolon separated list of protected file patterns and returns a glob.Glob slice

options/locale/locale_en-US.ini

@@ -1100,7 +1100,7 @@ pulls.is_checking = "Merge conflict checking is in progress. Try again in few mo
 pulls.required_status_check_failed = Some required checks were not successful.
 pulls.required_status_check_administrator = As an administrator, you may still merge this pull request.
 pulls.blocked_by_approvals = "This Pull Request doesn't have enough approvals yet. %d of %d approvals granted."
-pulls.blocked_by_rejection = "This Pull Request has an outdated head branch."
+pulls.blocked_by_rejection = "This Pull Request has changes requested by an official reviewer."
 pulls.blocked_by_outdated_branch = "This Pull Request is blocked by an outdated head branch."
 pulls.can_auto_merge_desc = This pull request can be merged automatically.
 pulls.cannot_auto_merge_desc = This pull request cannot be merged automatically due to conflicts.

services/pull/merge.go

@@ -584,7 +584,7 @@ func CheckPRReadyToMerge(pr *models.PullRequest) (err error) {
 
  if pr.ProtectedBranch.MergeBlockedByOutdatedBranch(pr) {
  return models.ErrNotAllowedToMerge{
- Reason: fmt.Sprintf("There head branch %d behind base branch", pr.CommitsBehind),
+ Reason: fmt.Sprintf("Head branch %d behind base branch", pr.CommitsBehind),
  }
  }