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 branch dropdown not display ref name #33159

Merged
merged 9 commits into from
Jan 9, 2025
Merged

Fix branch dropdown not display ref name #33159

merged 9 commits into from
Jan 9, 2025
+30 −20

Conversation

yp05327
Copy link
Contributor

@yp05327 yp05327 commented Jan 9, 2025 •
edited
Loading

Before:
image
After:
image

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Jan 9, 2025
@pull-request-size pull-request-size bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 9, 2025
@github-actions github-actions bot added the modifies/templates This PR modifies the template files label Jan 9, 2025
wxiaoguang
wxiaoguang reviewed Jan 9, 2025
View reviewed changes
templates/repo/home.tmpl Outdated Show resolved Hide resolved
@pull-request-size pull-request-size bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 9, 2025
@pull-request-size pull-request-size bot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Jan 9, 2025
@pull-request-size pull-request-size bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Jan 9, 2025
@wxiaoguang
Copy link
Contributor

I think we need to make it stricter, like this: 90b5aef

does it look good to you?

@wxiaoguang wxiaoguang added the backport/v1.23 This PR should be backported to Gitea 1.23 label Jan 9, 2025
@yp05327
Copy link
Contributor Author

yp05327 commented Jan 9, 2025

Oh, we already have IsViewCommit. Didn't notice that.
I was just confusing whether adding it or not, as if new type "commit" added, we/I should check how branchDropdownCurrentRefType works, to ensure that it won't cause any bugs.

@yp05327
Copy link
Contributor Author

yp05327 commented Jan 9, 2025

does it look good to you?

LGTM

@wxiaoguang
Copy link
Contributor

I was just confusing whether adding it or not, as if new type "commit" added, we/I should check how branchDropdownCurrentRefType works, to ensure that it won't cause any bugs.

I think it is right to do so, to make code return `${this.currentRepoLink}/branches/_new/${this.currentRefType}/${pathEscapeSegments(this.currentRefShortName)}`; work

@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 Jan 9, 2025
@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 Jan 9, 2025
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Jan 9, 2025
@lunny lunny enabled auto-merge (squash) January 9, 2025 18:05
@lunny lunny merged commit 2298ff2 into go-gitea:main Jan 9, 2025
26 checks passed
@GiteaBot GiteaBot added this to the 1.24.0 milestone Jan 9, 2025
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Jan 9, 2025
@yp05327 @wxiaoguang @GiteaBot
Fix branch dropdown not display ref name (go-gitea#33159)
8a56c8a 
Before:

![image](https://github.com/user-attachments/assets/899d25a9-80e9-48d5-a820-79c911c858e9)
After:

![image](https://github.com/user-attachments/assets/cf2a7407-909a-41db-9957-19d9214af57e)

---------

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@GiteaBot GiteaBot mentioned this pull request Jan 9, 2025
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 Jan 9, 2025
zjjhot added a commit to zjjhot/gitea that referenced this pull request Jan 10, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
9e7866c 
* giteaofficial/main:
  Fix raw file API ref handling (go-gitea#33172)
  [skip ci] Updated translations via Crowdin
  Fix ACME panic (go-gitea#33178)
  Automerge supports deleting branch automatically after merging (go-gitea#32343)
  Fix branch dropdown not display ref name (go-gitea#33159)
  Add .run to gitignore (go-gitea#33175)
  Fix assignee list overlapping in Issue sidebar (go-gitea#33176)
  Fix pam auth test regression (go-gitea#33169)
  Move repo size to sidebar (go-gitea#33155)
  Fix fuzz test (go-gitea#33156)
  Refactor older tests to use testify (go-gitea#33140)
  [skip ci] Updated translations via Crowdin
  Fix typo in gitea downloader test and add missing codebase in `ToGitServiceType` (go-gitea#33146)
  Fix form width (go-gitea#33151)
  Convert github.com/xanzy/go-gitlab into gitlab.com/gitlab-org/api/client-go (go-gitea#33126)
  Refactor HTMLFormat, update chroma render, fix js error (go-gitea#33136)
  Add missed transaction on setmerged (go-gitea#33079)
yp05327 added a commit that referenced this pull request Jan 10, 2025
@GiteaBot @yp05327 @wxiaoguang
Fix branch dropdown not display ref name (#33159) (#33183)
15ad001 
Backport #33159 by @yp05327

Before:

![image](https://github.com/user-attachments/assets/899d25a9-80e9-48d5-a820-79c911c858e9)
After:

![image](https://github.com/user-attachments/assets/cf2a7407-909a-41db-9957-19d9214af57e)

Co-authored-by: yp05327 <576951401@qq.com>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
@wxiaoguang wxiaoguang deleted the fix-refname branch January 10, 2025 01:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wxiaoguang wxiaoguang wxiaoguang 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.23 This PR should be backported to Gitea 1.23 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/templates This PR modifies the template files size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
1.24.0
Development

Successfully merging this pull request may close these issues.
4 participants
@yp05327 @wxiaoguang @lunny @GiteaBot