Skip to content

Fix double blob-hunk on diff page #19404

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
Merged
merged 1 commit into from
Apr 15, 2022
Merged

Fix double blob-hunk on diff page #19404

merged 1 commit into from
Apr 15, 2022

Conversation

Gusted
Copy link
Contributor

@Gusted Gusted commented Apr 14, 2022 •
edited
Loading

  • Don't show the blob-hunk twice.

Before:
image

After:
image

Fix double blob-hunk
740e60e 
- Don't show the blob-hunk twice.
@Gusted Gusted added this to the 1.17.0 milestone Apr 14, 2022
Gusted pushed a commit to Gusted/gitea that referenced this pull request Apr 14, 2022
Fix double blob-hunk (go-gitea#19404)
523db37 
- Backport go-gitea#19404
  - Don't show the blob-hunk twice.
@Gusted Gusted mentioned this pull request Apr 14, 2022
Merged
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Apr 14, 2022
@lunny
Copy link
Member

lunny commented Apr 15, 2022

  • Don't show the blob-hunk twice.

Before: image

After: image

Could you reproduce that in https://try.gitea.io ?

@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 15, 2022
wxiaoguang pushed a commit that referenced this pull request Apr 15, 2022
Fix double blob-hunk on diff page (#19404) (#19405)
00da1fa 
- Don't show the blob-hunk twice on diff page
- Backport #19404
@wxiaoguang wxiaoguang changed the title Fix double blob-hunk Fix double blob-hunk on diff page Apr 15, 2022
@Gusted
Copy link
Contributor Author

Gusted commented Apr 15, 2022

Could you reproduce that in https://try.gitea.io ?

Yes, see
https://try.gitea.io/Gusted/Test-repo/commit/1c39022e059d511b15075d45c15a4abbde081d1b

@lunny lunny merged commit 9053096 into go-gitea:main Apr 15, 2022
@lunny lunny added the backport/done All backports for this PR have been created label Apr 15, 2022
zjjhot added a commit to zjjhot/gitea that referenced this pull request Apr 15, 2022
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
7233731 
* giteaofficial/main:
  Fix double blob-hunk (go-gitea#19404)
  Use a struct as test options (go-gitea#19393)
AbdulrhmnGhanem pushed a commit to kitspace/gitea that referenced this pull request Aug 24, 2022
@AbdulrhmnGhanem
Fix double blob-hunk (go-gitea#19404)
df5a95b 
- Don't show the blob-hunk twice.
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@techknowlogick techknowlogick techknowlogick approved these changes

@wxiaoguang wxiaoguang wxiaoguang 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.
5 participants
@Gusted @lunny @techknowlogick @wxiaoguang @GiteaBot