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.

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

Fix View File button link if branch deleted on pull request files pages #31063

Merged
merged 2 commits into from
May 25, 2024
Merged

Fix View File button link if branch deleted on pull request files pages #31063

merged 2 commits into from
May 25, 2024

Conversation

metiftikci
Copy link
Contributor

as title

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 23, 2024
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label May 23, 2024
@github-actions github-actions bot added the modifies/go Pull requests that update Go code label May 23, 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 May 23, 2024
lunny
lunny requested changes May 24, 2024
View reviewed changes
Copy link
Member

@lunny lunny left a comment

Choose a reason for hiding this comment

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

per https://github.com/go-gitea/gitea/pull/31063/files#r1612526557

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 24, 2024
@metiftikci
Copy link
Contributor Author

metiftikci commented May 24, 2024 •
edited
Loading

this is also usefull when reviewing specific commit in pull request

github also not redirecting to branch

so if you do not want to change branch link behaviour, do you have any suggestion ? like should we check if branch deleted ?

@lunny
Copy link
Member

lunny commented May 25, 2024

I mean if there are serveal commits on a pull request and when view files on one commit mode. The link should be that commit's id but not end commit id?

@metiftikci
Copy link
Contributor Author

metiftikci commented May 25, 2024 •
edited
Loading

This is how it works after change:

Show All Commit: last commit

image

View Range: last selected commit

image

View One Commit: selected commit

image

@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged labels May 25, 2024
@lunny lunny added backport/v1.22 This PR should be backported to Gitea 1.22 reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 25, 2024
@lunny lunny enabled auto-merge (squash) May 25, 2024 13:33
@lunny lunny merged commit 47e715a into go-gitea:main May 25, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.23.0 milestone May 25, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request May 25, 2024
@metiftikci @GiteaBot
Fix View File button link if branch deleted on pull request files p…
c3c508e 
…ages (go-gitea#31063)

as title
@GiteaBot GiteaBot mentioned this pull request May 25, 2024
Merged
@GiteaBot GiteaBot added backport/done All backports for this PR have been created and removed reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels May 25, 2024
lunny pushed a commit that referenced this pull request May 26, 2024
@GiteaBot
Fix View File button link if branch deleted on pull request files p…
02b947a 
…ages (#31063) (#31077)
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 27, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9d1e929 
* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  Make gitea webhooks openproject compatible (go-gitea#28435)
  Change `--border-radius-circle` to `--border-radius-full` (go-gitea#30936)
  Fix `View File` button link if branch deleted on pull request files pages (go-gitea#31063)
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 23, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@delvh delvh delvh approved these changes

@lunny lunny lunny approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created 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/go Pull requests that update Go code size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Milestone
1.23.0
Development

Successfully merging this pull request may close these issues.
4 participants
@metiftikci @lunny @delvh @GiteaBot