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.

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

make show stats work when only one file changed #32244

Merged
merged 3 commits into from
Oct 14, 2024

Conversation

a1012112796
Copy link
Member

fix #32226

in #27775 , it do some changes to only show diff file tree when more than one file changed. But looks it also break the diff-file-list logic, which looks not expected change. so try fix it.

/cc @silverwind

example view:
image

fix go-gitea#32226

in go-gitea#27775 ,
it do some changes to only show diff file tree when more than one
file changed. But looks it also break the `diff-file-list` logic,
which looks not expected change. so try fix it.

/cc @silverwind

Signed-off-by: a1012112796 <1012112796@qq.com>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Oct 12, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Oct 12, 2024
@lunny lunny added type/bug backport/v1.22 This PR should be backported to Gitea 1.22 labels Oct 12, 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 Oct 12, 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 14, 2024
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Oct 14, 2024
@lunny lunny enabled auto-merge (squash) October 14, 2024 21:18
@lunny lunny merged commit c4b2808 into go-gitea:main Oct 14, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Oct 14, 2024
@GiteaBot
Copy link
Contributor

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

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

@GiteaBot GiteaBot added backport/manual No power to the bots! Create your backport yourself! and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Oct 14, 2024
@a1012112796 a1012112796 deleted the zzc/dev/diff-list-view branch October 15, 2024 11:30
a1012112796 added a commit to a1012112796/gitea that referenced this pull request Oct 15, 2024
Backport go-gitea#32244

fix go-gitea#32226

in go-gitea#27775 , it do some changes to
only show diff file tree when more than one file changed. But looks it
also break the `diff-file-list` logic, which looks not expected change.
so try fix it.

/cc @silverwind

example view:

![image](https://github.com/user-attachments/assets/281e9c4f-a269-4d36-94eb-a132058aea87)

Signed-off-by: a1012112796 <1012112796@qq.com>
@a1012112796 a1012112796 added backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! and removed backport/manual No power to the bots! Create your backport yourself! labels Oct 15, 2024
@lunny lunny modified the milestones: 1.24.0, 1.23.0 Oct 15, 2024
zjjhot added a commit to zjjhot/gitea that referenced this pull request Oct 16, 2024
* 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)
lunny pushed a commit that referenced this pull request Oct 17, 2024
Backport #32244

fix #32226

in #27775 , it do some changes to
only show diff file tree when more than one file changed. But looks it
also break the `diff-file-list` logic, which looks not expected change.
so try fix it.

/cc @silverwind

example view:

![image](https://github.com/user-attachments/assets/281e9c4f-a269-4d36-94eb-a132058aea87)

Signed-off-by: a1012112796 <1012112796@qq.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.22 This PR should be backported to Gitea 1.22 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/frontend size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Show Stats does nothing
4 participants