Skip to content

Fix branch_protection api shows users/teams who has no readAccess#30291

Merged
silverwind merged 11 commits into
go-gitea:mainfrom
edwardzhanged:branch_protection_api_readAccess_enhancement
Apr 17, 2024
Merged

Fix branch_protection api shows users/teams who has no readAccess#30291
silverwind merged 11 commits into
go-gitea:mainfrom
edwardzhanged:branch_protection_api_readAccess_enhancement

Conversation

@edwardzhanged
Copy link
Copy Markdown
Contributor

Add some logic in convert.ToBranchProtection to return only the names associated with readAccess instead of returning all names. This will ensure consistency in behavior between the frontend and backend.
Fixes: #27694

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Apr 5, 2024
@edwardzhanged
Copy link
Copy Markdown
Contributor Author

Any comment please?

@wxiaoguang
Copy link
Copy Markdown
Contributor

ping @lunny

Comment thread services/convert/convert.go Outdated
@lunny lunny added this to the 1.23.0 milestone Apr 13, 2024
@pull-request-size pull-request-size Bot added size/M and removed size/L labels Apr 14, 2024
@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 Apr 14, 2024
@edwardzhanged
Copy link
Copy Markdown
Contributor Author

Need another approve.

Comment thread services/convert/convert.go Outdated
Comment thread services/convert/convert.go Outdated
@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 Apr 16, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 17, 2024
@silverwind silverwind merged commit 02e183b into go-gitea:main Apr 17, 2024
@GiteaBot
Copy link
Copy Markdown
Collaborator

I was unable to create a backport for 1.21. @edwardzhanged, please send one manually. 🍵

go run ./contrib/backport 30291
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Apr 17, 2024
GiteaBot added a commit to GiteaBot/gitea that referenced this pull request Apr 17, 2024
…-gitea#30291)

Add some logic in `convert.ToBranchProtection` to return only the names
associated with readAccess instead of returning all names. This will
ensure consistency in behavior between the frontend and backend.
Fixes: go-gitea#27694

---------

Co-authored-by: techknowlogick <techknowlogick@gitea.com>
Co-authored-by: wenzhuo.zhang <wenzhuo.zhang@geely.com>
Co-authored-by: Giteabot <teabot@gitea.io>
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Apr 17, 2024
silverwind pushed a commit that referenced this pull request Apr 17, 2024
…0291) (#30544)

Backport #30291 by @edwardzhanged

Add some logic in `convert.ToBranchProtection` to return only the names
associated with readAccess instead of returning all names. This will
ensure consistency in behavior between the frontend and backend.
Fixes: #27694

Co-authored-by: Edward Zhang <45360012+edwardzhanged@users.noreply.github.com>
Co-authored-by: techknowlogick <techknowlogick@gitea.com>
Co-authored-by: wenzhuo.zhang <wenzhuo.zhang@geely.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 18, 2024
* giteaofficial/main:
  Add an api test for updating user (go-gitea#30539)
  [skip ci] Updated translations via Crowdin
  Expose fuzzy search for issues/pulls (go-gitea#29701)
  Allow everyone to read or write a wiki by a repo unit setting (go-gitea#30495)
  Support nuspec manifest download for nuget packages (go-gitea#28921)
  Fix branch_protection api shows users/teams who has no readAccess (go-gitea#30291)
  Correct locale string rendering (go-gitea#30522)
  Run `go generate` and `go vet` on all packages (go-gitea#30529)
  Fix and tweak pull request commit list (go-gitea#30528)
  Refactor web routes (go-gitea#30519)
  Fix install page checkboxes and dropdown width (go-gitea#30526)

# Conflicts:
#	routers/web/user/home.go
#	templates/user/dashboard/issues.tmpl
@wxiaoguang wxiaoguang modified the milestones: 1.23.0, 1.22.0 Apr 27, 2024
@wxiaoguang wxiaoguang removed backport/manual No power to the bots! Create your backport yourself! backport/v1.21 labels Jun 20, 2024
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jul 16, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Rest API invalid output compared to UI

6 participants