Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add branch protection setting for ignoring stale approvals #28498

Merged
merged 22 commits into from
Jan 15, 2024
Merged

Add branch protection setting for ignoring stale approvals #28498

merged 22 commits into from
Jan 15, 2024

Conversation

jpraet
Copy link
Member

@jpraet jpraet commented Dec 17, 2023

Fixes #27114.

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.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Dec 17, 2023
@pull-request-size pull-request-size bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 17, 2023
@github-actions github-actions bot added modifies/translation modifies/api This PR adds API routes or modifies them modifies/migrations labels Dec 17, 2023
delvh
delvh reviewed Dec 18, 2023
View reviewed changes
options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
templates/repo/settings/protected_branch.tmpl Outdated Show resolved Hide resolved
delvh
delvh reviewed Dec 19, 2023
View reviewed changes
web_src/js/features/repo-settings.js Outdated Show resolved Hide resolved
options/locale/locale_en-US.ini Outdated Show resolved Hide resolved
@jpraet jpraet added this to the 1.22.0 milestone Dec 30, 2023
@delvh delvh added the type/enhancement An improvement of existing functionality label Dec 30, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels Dec 30, 2023
@jpraet jpraet requested a review from lunny January 11, 2024 14:53
@GiteaBot GiteaBot removed the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Jan 14, 2024
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Jan 14, 2024
@denyskon denyskon added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 14, 2024
@lunny lunny enabled auto-merge (squash) January 15, 2024 07:13
@lunny lunny merged commit 5d3fdd1 into go-gitea:main Jan 15, 2024
25 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 15, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 16, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
b112684 
* giteaofficial/main: (34 commits)
  Use refname:strip-2 instead of refname:short when syncing tags (go-gitea#28797)
  Add gist to comparison (go-gitea#28809)
  Fix links in issue card (go-gitea#28806)
  Show latest commit for file (go-gitea#28067)
  Add ability to see open and closed issues at the same time (go-gitea#28757)
  Display latest sync time for pull mirrors on the repo page (go-gitea#28712)
  Fix `GetCommitStatuses` (go-gitea#28787)
  Caller should check the ResponseExtra.HasError() first to see whether the request fails (go-gitea#28796)
  Rework markup link rendering (go-gitea#26745)
  Fix nil pointer panic when exec some gitea cli command (go-gitea#28791)
  Add branch protection setting for ignoring stale approvals (go-gitea#28498)
  Forbid removing the last admin user (go-gitea#28337)
  Fix when private user following user, private user will not be counted in his own view (go-gitea#28037)
  Update github.com/cloudflare/circl (go-gitea#28789)
  Move more functions to db.Find (go-gitea#28419)
  Add non-JS fallback for reaction tooltips (go-gitea#28785)
  Modernize merge button (go-gitea#28140)
  Warn that `DISABLE_QUERY_AUTH_TOKEN` is false only if it's explicitly defined (go-gitea#28783)
  Speed up loading the dashboard on mysql/mariadb (go-gitea#28546)
  Fix schedule tasks bugs (go-gitea#28691)
  ...
@yp05327
Copy link
Contributor

yp05327 commented Jan 17, 2024

@lunny @jpraet
migration is added but not be called. Should be fixed quickly.

@lunny lunny mentioned this pull request Jan 17, 2024
Merged
lunny added a commit that referenced this pull request Jan 17, 2024
@lunny
Add missing migration (#28827)
2bdab94 
Missed from #28498
@delvh
Copy link
Member

delvh commented Jan 17, 2024

Fixed in #28827

fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
@jpraet @delvh @fuxiaohei
Add branch protection setting for ignoring stale approvals (go-gitea#…
ca2d339 
…28498)

Fixes go-gitea#27114.

* In Gitea 1.12 (go-gitea#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 (go-gitea#12674), the "dismiss review" feature was added.
* This caused confusion with users (go-gitea#25858), as "dismiss" now means 2
different things.
* In Gitea 1.20 (go-gitea#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 <[email protected]>
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
@lunny @fuxiaohei
Add missing migration (go-gitea#28827)
9a4738f 
Missed from go-gitea#28498
henrygoodman pushed a commit to henrygoodman/gitea that referenced this pull request Jan 31, 2024
@lunny @henrygoodman
Add missing migration (go-gitea#28827)
09b8b96 
Missed from go-gitea#28498
@lunny lunny mentioned this pull request Feb 19, 2024
Merged
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@jpraet @delvh @silverwind
Add branch protection setting for ignoring stale approvals (go-gitea#…
8f21815 
…28498)

Fixes go-gitea#27114.

* In Gitea 1.12 (go-gitea#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 (go-gitea#12674), the "dismiss review" feature was added.
* This caused confusion with users (go-gitea#25858), as "dismiss" now means 2
different things.
* In Gitea 1.20 (go-gitea#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 <[email protected]>
silverwind pushed a commit to silverwind/gitea that referenced this pull request Feb 20, 2024
@lunny @silverwind
Add missing migration (go-gitea#28827)
2f02891 
Missed from go-gitea#28498
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 8, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lunny lunny lunny approved these changes

@denyskon denyskon denyskon approved these changes

@delvh delvh delvh approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/api This PR adds API routes or modifies them modifies/migrations modifies/translation size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/enhancement An improvement of existing functionality
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

Approvals are dismissed when new commits are pushed
6 participants
@jpraet @yp05327 @delvh @lunny @denyskon @GiteaBot