Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Allow maintainers to view and edit files of private repos when "Allow maintainers to edit" is enabled #32215

Merged
merged 7 commits into from
Oct 11, 2024
Merged

Allow maintainers to view and edit files of private repos when "Allow maintainers to edit" is enabled #32215

merged 7 commits into from
Oct 11, 2024

Conversation

Zettat123
Copy link
Contributor

Fix #31539

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 8, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 8, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label Oct 8, 2024
@Zettat123 Zettat123 marked this pull request as draft October 8, 2024 10:07
@Zettat123 Zettat123 marked this pull request as ready for review October 9, 2024 05:30
Zettat123
Zettat123 commented Oct 9, 2024
View reviewed changes
routers/web/repo/pull.go
@@ -887,8 +887,6 @@ func viewPullFiles(ctx *context.Context, specifiedStartCommit, specifiedEndCommi
}

if pull.HeadRepo != nil {
ctx.Data["SourcePath"] = pull.HeadRepo.Link() + "/src/commit/" + endCommitID
Copy link
Contributor Author

@Zettat123 Zettat123 Oct 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we don't need to edit SourcePath here. Its value is already set by the setCompareContext.

gitea/routers/web/repo/pull.go

Line 834 in 8bee7fc

setCompareContext(ctx, baseCommit, commit, ctx.Repo.Owner.Name, ctx.Repo.Repository.Name)

And if we use the link of head repo here, the maintainer of the base repository won't be able to view the file.

@lunny
Copy link
Member

lunny commented Oct 9, 2024 •
edited
Loading

Should we also change RequireRepoWriter?
It's better to have some tests.

@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 10, 2024
@Zettat123
Copy link
Contributor Author

Zettat123 commented Oct 10, 2024 •
edited
Loading

Should we also change RequireRepoWriter?

I checked the references of RequireRepoWriter and none of them require checking "Allow maintainers to edit". So I think we don't need to change it for now

It's better to have some tests.

See b02fffe

@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 Oct 11, 2024
@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 Oct 11, 2024
@lunny lunny added this to the 1.23.0 milestone Oct 11, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 11, 2024
@lunny lunny enabled auto-merge (squash) October 11, 2024 18:38
@lunny lunny merged commit 0fe5e2b into go-gitea:main Oct 11, 2024
26 checks passed
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 11, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 16, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
88e59ef 
* giteaofficial/main:
  Make `owner/repo/pulls` handlers use "PR reader" permission (go-gitea#32254)
  make `show stats` work when only one file changed (go-gitea#32244)
  Update scheduled tasks even if changes are pushed by "ActionsUser" (go-gitea#32246)
  Support migrating GitHub/GitLab PR draft status (go-gitea#32242)
  Only rename a user when they should receive a different name (go-gitea#32247)
  Fix dropdown content overflow (go-gitea#31610)
  Make git push options accept short name (go-gitea#32245)
  Allow code search by filename (go-gitea#32210)
  Allow maintainers to view and edit files of private repos when "Allow maintainers to edit" is enabled (go-gitea#32215)
  Use per package global lock for container uploads instead of memory lock (go-gitea#31860)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Jan 9, 2025
# for free to subscribe to this conversation on GitHub. Already have an account? #.
Reviewers

@lunny lunny lunny approved these changes

@wolfogre wolfogre wolfogre 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/go Pull requests that update Go code size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.

Can not view code in pr when change a lot
4 participants
@Zettat123 @lunny @wolfogre @GiteaBot