diff options
| author | Jimmy Praet <jimmy.praet@telenet.be> | 2024-01-15 08:20:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-15 07:20:01 +0000 |
| commit | 5d3fdd121279c758f247a76e020799aa5e548feb (patch) | |
| tree | e27b631cfdfd35d673da1130c9639633a1e3bc10 /options | |
| parent | ce0225c1b87d682f53b87496c8dd6ccee0396f0b (diff) | |
| download | gitea-5d3fdd121279c758f247a76e020799aa5e548feb.tar.gz gitea-5d3fdd121279c758f247a76e020799aa5e548feb.zip | |
Add branch protection setting for ignoring stale approvals (#28498)
Fixes #27114.
* In Gitea 1.12 (#9532), a "dismiss stale approvals" branch protection
setting was introduced, for ignoring stale reviews when verifying the
approval count of a pull request.
* In Gitea 1.14 (#12674), the "dismiss review" feature was added.
* This caused confusion with users (#25858), as "dismiss" now means 2
different things.
* In Gitea 1.20 (#25882), the behavior of the "dismiss stale approvals"
branch protection was modified to actually dismiss the stale review.
For some users this new behavior of dismissing the stale reviews is not
desirable.
So this PR reintroduces the old behavior as a new "ignore stale
approvals" branch protection setting.
---------
Co-authored-by: delvh <dev.lh@web.de>
Diffstat (limited to 'options')
| -rw-r--r-- | options/locale/locale_en-US.ini | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 95148bb644..90e3ac503a 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2315,6 +2315,8 @@ settings.protect_approvals_whitelist_users = Whitelisted reviewers: settings.protect_approvals_whitelist_teams = Whitelisted teams for reviews: settings.dismiss_stale_approvals = Dismiss stale approvals settings.dismiss_stale_approvals_desc = When new commits that change the content of the pull request are pushed to the branch, old approvals will be dismissed. +settings.ignore_stale_approvals = Ignore stale approvals +settings.ignore_stale_approvals_desc = Do not count approvals that were made on older commits (stale reviews) towards how many approvals the PR has. Irrelevant if stale reviews are already dismissed. settings.require_signed_commits = Require Signed Commits settings.require_signed_commits_desc = Reject pushes to this branch if they are unsigned or unverifiable. settings.protect_branch_name_pattern = Protected Branch Name Pattern |