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

Cleanup protected branches when deleting users & teams #19158

Merged
merged 4 commits into from
Mar 22, 2022
Merged

Cleanup protected branches when deleting users & teams #19158

merged 4 commits into from
Mar 22, 2022

Conversation

noerw
Copy link
Member

@noerw noerw commented Mar 21, 2022 •
edited by zeripath
Loading

There are actually more places where inconsistency can come up (eg any change to access or team_repo), but those won't result in user facing errors.
It's messy to fix these, as the uids are stored as JSON array strings in the DB, meaning every change to the array needs to happen on client side. Refactoring to use a new table protected_branch_user is not in scope for me, so I send this PR despite shortcomings.

Fix #19094

@noerw noerw added the type/bug label Mar 21, 2022
@noerw noerw added this to the 1.17.0 milestone Mar 21, 2022
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 21, 2022
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 21, 2022
@noerw noerw added the status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR label Mar 21, 2022
@noerw
Copy link
Member Author

noerw commented Mar 21, 2022

blocking as i found an issue with team deletion

@noerw noerw added backport/v1.16 and removed status/blocked This PR cannot be merged yet, i.e. because it depends on another unmerged PR labels Mar 21, 2022
@lunny
Copy link
Member

lunny commented Mar 22, 2022

make L-G-T-M work

@lunny lunny merged commit 77d1c7b into go-gitea:main Mar 22, 2022
@lunny
Copy link
Member

lunny commented Mar 22, 2022

Please send backport.

zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 22, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
f9c05a9 
* giteaofficial/main:
  Fix the bug: deploy key with write access can not push (go-gitea#19010)
  Renamed ctx.User to ctx.Doer. (go-gitea#19161)
  [docs] Enhance container selection in docker dump (go-gitea#14292)
  Cleanup protected branches when deleting users & teams (go-gitea#19158)
  Reorder issue templates and automatically add labels (go-gitea#18875)
  Use IterateBufferSize whilst querying repositories during adoption check (go-gitea#19140)
noerw added a commit to noerw/gitea that referenced this pull request Mar 22, 2022
@noerw @lafriks
Cleanup protected branches when deleting users & teams (go-gitea#19158)
80c5967 
* Clean up protected_branches when deleting user

fixes go-gitea#19094

* Clean up protected_branches when deleting teams

* fix issue

Co-authored-by: Lauris BH <lauris@nix.lv>
@noerw noerw mentioned this pull request Mar 22, 2022
Merged
@noerw noerw added the backport/done All backports for this PR have been created label Mar 22, 2022
lunny added a commit that referenced this pull request Mar 23, 2022
@noerw @lafriks
@zeripath @lunny @wxiaoguang
Cleanup protected branches when deleting users & teams (#19158) (#19174)
743553f 
* Clean up protected_branches when deleting user

fixes #19094

* Clean up protected_branches when deleting teams

* fix issue

Co-authored-by: Lauris BH <lauris@nix.lv>

Co-authored-by: Lauris BH <lauris@nix.lv>
Co-authored-by: zeripath <art27@cantab.net>
Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zeripath added a commit to zeripath/gitea that referenced this pull request Mar 23, 2022
@zeripath
Changelog for 1.16.5
fb7de1c 
 ## [1.16.5](https://github.com/go-gitea/gitea/releases/tag/1.16.5) - 2022-03-23

* BREAKING
  * Bump to build with go1.18 (go-gitea#19120 et al) (go-gitea#19127)
* SECURITY
  * Prevent redirect to Host (2) (go-gitea#19175) (go-gitea#19186)
  * Try to prevent autolinking of displaynames by email readers (go-gitea#19169) (go-gitea#19183)
  * Clean paths when looking in Storage (go-gitea#19124) (go-gitea#19179)
  * Do not send notification emails to inactive users (go-gitea#19131) (go-gitea#19139)
  * Do not send activation email if manual confirm is set (go-gitea#19119) (go-gitea#19122)
* ENHANCEMENTS
  * Use the new/choose link for New Issue on project page (go-gitea#19172) (go-gitea#19176)
* BUGFIXES
  * Fix compare link in active feeds for new branch (go-gitea#19149) (go-gitea#19185)
  * Redirect .wiki/* ui link to /wiki (go-gitea#18831) (go-gitea#19184)
  * Ensure deploy keys with write access can push (go-gitea#19010) (go-gitea#19182)
  * Ensure that setting.LocalURL always has a trailing slash (go-gitea#19171) (go-gitea#19177)
  * Cleanup protected branches when deleting users & teams (go-gitea#19158) (go-gitea#19174)
  * Use IterateBufferSize whilst querying repositories during adoption check (go-gitea#19140) (go-gitea#19160)
  * Fix NPE /repos/issues/search when not signed in (go-gitea#19154) (go-gitea#19155)
  * Use custom favicon when viewing static files if it exists (go-gitea#19130) (go-gitea#19152)
  * Fix the editor height in review box (go-gitea#19003) (go-gitea#19147)
  * Ensure isSSH is set whenever DISABLE_HTTP_GIT is set (go-gitea#19028) (go-gitea#19146)
  * Fix wrong scopes caused by empty scope input (go-gitea#19029) (go-gitea#19145)
  * Make migrations SKIP_TLS_VERIFY apply to git too (go-gitea#19132) (go-gitea#19141)
  * Handle email address not exist (go-gitea#19089) (go-gitea#19121)
* MISC
  * Update json-iterator to allow compilation with go1.18 (go-gitea#18644) (go-gitea#19100)
  * Update golang.org/x/crypto (go-gitea#19097) (go-gitea#19098)

Signed-off-by: Andrew Thornton <art27@cantab.net>
@zeripath zeripath mentioned this pull request Mar 23, 2022
Merged
Chianina pushed a commit to Chianina/gitea that referenced this pull request Mar 28, 2022
@noerw @lafriks
Cleanup protected branches when deleting users & teams (go-gitea#19158)
06bf037 
* Clean up protected_branches when deleting user

fixes go-gitea#19094

* Clean up protected_branches when deleting teams

* fix issue

Co-authored-by: Lauris BH <lauris@nix.lv>
@go-gitea go-gitea locked and limited conversation to collaborators Apr 28, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@lafriks lafriks lafriks approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.17.0
Development

Successfully merging this pull request may close these issues.

Deleted user is being used in branch protection whitelisting
4 participants
@noerw @lunny @lafriks @GiteaBot