diff --git a/models/issues/review.go b/models/issues/review.go index bcbbc16b6b..9a08e265ff 100644 --- a/models/issues/review.go +++ b/models/issues/review.go @@ -218,12 +218,12 @@ func (r *Review) LoadAttributes(ctx context.Context) (err error) { func (r *Review) HTMLTypeColorName() string { switch r.Type { case ReviewTypeApprove: - if r.Stale { - return "yellow" - } if !r.Official { return "grey" } + if r.Stale { + return "yellow" + } return "green" case ReviewTypeComment: return "grey" diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 83272acf3a..2b2e44e225 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2420,7 +2420,7 @@ settings.protect_status_check_matched = Matched settings.protect_invalid_status_check_pattern = Invalid status check pattern: "%s". settings.protect_no_valid_status_check_patterns = No valid status check patterns. settings.protect_required_approvals = Required approvals: -settings.protect_required_approvals_desc = Allow only to merge pull request with enough required approvals. Qualifying approvals are either from users or teams who are on the allowlist or anyone with write access. +settings.protect_required_approvals_desc = Allow only to merge pull request with enough required approvals. Required approvals are either from users or teams who are on the allowlist or anyone with write access. settings.protect_approvals_whitelist_enabled = Restrict approvals to allowlisted users or teams settings.protect_approvals_whitelist_enabled_desc = Only reviews from allowlisted users or teams will count to the required approvals. Without approval allowlist, reviews from anyone with write access count to the required approvals. settings.protect_approvals_whitelist_users = Allowlisted reviewers: