Skip to content

Commit 2d8f86b

Browse files
Tweak test and prioritize official/non-official over stale
1 parent 4975dee commit 2d8f86b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

models/issues/review.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -218,12 +218,12 @@ func (r *Review) LoadAttributes(ctx context.Context) (err error) {
218218
func (r *Review) HTMLTypeColorName() string {
219219
switch r.Type {
220220
case ReviewTypeApprove:
221-
if r.Stale {
222-
return "yellow"
223-
}
224221
if !r.Official {
225222
return "grey"
226223
}
224+
if r.Stale {
225+
return "yellow"
226+
}
227227
return "green"
228228
case ReviewTypeComment:
229229
return "grey"

options/locale/locale_en-US.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2420,7 +2420,7 @@ settings.protect_status_check_matched = Matched
24202420
settings.protect_invalid_status_check_pattern = Invalid status check pattern: "%s".
24212421
settings.protect_no_valid_status_check_patterns = No valid status check patterns.
24222422
settings.protect_required_approvals = Required approvals:
2423-
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.
2423+
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.
24242424
settings.protect_approvals_whitelist_enabled = Restrict approvals to allowlisted users or teams
24252425
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.
24262426
settings.protect_approvals_whitelist_users = Allowlisted reviewers:

0 commit comments

Comments
 (0)