Collaborator trust model should trust collaborators #18539
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was an unintended regression in go-gitea#17917 which leads to only repository admin commits being trusted. This PR restores the old logic. Fix go-gitea#18501 Signed-off-by: Andrew Thornton <art27@cantab.net>
6543
approved these changes
Feb 2, 2022
GiteaBot
added
the
lgtm/need 1
|
some tests to not ensure regression again would be nice 😓 |
lunny
reviewed
Feb 2, 2022
Signed-off-by: Andrew Thornton <art27@cantab.net>
lunny
approved these changes
Feb 2, 2022
GiteaBot
added
lgtm/done
zeripath
added a commit
to zeripath/gitea
that referenced
this pull request
Feb 2, 2022
Backport go-gitea#18539 There was an unintended regression in go-gitea#17917 which leads to only repository admin commits being trusted. This PR restores the old logic. Fix go-gitea#18501 Signed-off-by: Andrew Thornton <art27@cantab.net>
zjjhot
added a commit
to zjjhot/gitea
that referenced
this pull request
Feb 2, 2022
* giteaofficial/main: (37 commits) Collaborator trust model should trust collaborators (go-gitea#18539) Detect conflicts with 3way merge (go-gitea#18536) [skip ci] Updated translations via Crowdin Update 1.16.0 changelog to set go-gitea#17846 as breaking (go-gitea#18533) In docker rootless use $GITEA_APP_INI if provided (go-gitea#18524) revert to node14 for snapcraft Add `GetUserTeams` (go-gitea#18499) Fix review excerpt (go-gitea#18502) Update JS dependencies, fix lint (go-gitea#18389) add test coverage for original author conversion during migrations (go-gitea#18506) add gitea-fmt back (go-gitea#18526) Fix non-ASCII search on database (go-gitea#18437) Use "read" value for General Access (go-gitea#18496) Fix for AvatarURL database type (go-gitea#18487) Remove go 1.15 support (go-gitea#18511) [skip ci] Updated translations via Crowdin Use `ImagedProvider` for gplus oauth2 provider (go-gitea#18504) build with node16 in snap (go-gitea#18508) point to s3 endpoint directly (go-gitea#18497) Fix OAuth Source Edit Page (go-gitea#18495) ...
zeripath
deleted the
fix-18501-trust-status-should-use-IsOwnerMemberCollaborator
branch
Chianina
pushed a commit
to Chianina/gitea
that referenced
this pull request
Mar 28, 2022
* Collaborator trust model should trust collaborators There was an unintended regression in go-gitea#17917 which leads to only repository admin commits being trusted. This PR restores the old logic. Fix go-gitea#18501 Signed-off-by: Andrew Thornton <art27@cantab.net>
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was an unintended regression in #17917 which leads to only
repository admin commits being trusted. This PR restores the old logic.
Fix #18501
Signed-off-by: Andrew Thornton art27@cantab.net