Skip to content

fix: remove duplicate IDs #35210

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 8 commits into from
Aug 18, 2025
Merged

fix: remove duplicate IDs #35210

merged 8 commits into from
Aug 18, 2025

Conversation

kerwin612
Copy link
Member

@kerwin612 kerwin612 commented Aug 4, 2025 •
edited
Loading

No description provided.

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Aug 4, 2025
@github-actions github-actions bot added modifies/templates This PR modifies the template files modifies/frontend labels Aug 4, 2025
silverwind
silverwind reviewed Aug 4, 2025
View reviewed changes
silverwind
silverwind reviewed Aug 4, 2025
View reviewed changes
kerwin612 and others added 2 commits August 4, 2025 21:22
@kerwin612 @silverwind
Update web_src/js/features/repo-code.ts
d7ccf38 
Co-authored-by: silverwind <me@silverwind.io>
Signed-off-by: Kerwin Bryant <kerwin612@qq.com>
@kerwin612 @silverwind
Update web_src/js/features/repo-code.ts
c63f1d2 
Co-authored-by: silverwind <me@silverwind.io>
Signed-off-by: Kerwin Bryant <kerwin612@qq.com>
@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 Aug 4, 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 Aug 5, 2025
@lunny lunny added this to the 1.25.0 milestone Aug 5, 2025
wxiaoguang
wxiaoguang previously requested changes Aug 5, 2025
View reviewed changes
Copy link
Contributor

@wxiaoguang wxiaoguang left a comment

Choose a reason for hiding this comment

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

I think other pages are broken.

Image

@GiteaBot GiteaBot added lgtm/blocked A maintainer has reservations with the PR and thus it cannot be merged and removed lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. labels Aug 5, 2025
wxiaoguang
wxiaoguang reviewed Aug 5, 2025
View reviewed changes
@kerwin612 kerwin612 force-pushed the feature/multi-line-selection-url branch from 291c27c to 886f546 Compare August 9, 2025 09:35
@kerwin612 kerwin612 requested a review from wxiaoguang August 9, 2025 09:54
@wxiaoguang
Copy link
Contributor

Have you fixed the problems?

image

ps: I don't have time recently, feel free to ask other maintainers to review and dismiss my "change request" if the bugs have been fixed.

@wxiaoguang wxiaoguang removed their request for review August 9, 2025 13:16
wxiaoguang
wxiaoguang reviewed Aug 9, 2025
View reviewed changes
@kerwin612 kerwin612 requested a review from a team August 11, 2025 02:15
wxiaoguang
wxiaoguang reviewed Aug 11, 2025
View reviewed changes
@kerwin612 kerwin612 changed the title feat: support multi-line selection with URL parameters fix: remove duplicate IDs Aug 11, 2025
@lunny lunny requested a review from wxiaoguang August 18, 2025 03:19
@wxiaoguang
Copy link
Contributor

No need to ask for my review.

Actually I don't understand the details of "feat: support multi-line selection with URL parameters" and "fix: remove duplicate IDs", no idea about the changed code (most changes have been reverted and only one line changes now), so no idea what it is going to fix.

ps: I don't have time recently, feel free to ask other maintainers to review and dismiss my "change request" if the bugs have been fixed.

If you know what it is for and have tested it, and it works as expectation, feel free to remove my "change request".

@wxiaoguang wxiaoguang removed their request for review August 18, 2025 05:25
@lunny lunny dismissed wxiaoguang’s stale review August 18, 2025 16:26

The PR's purpose changed. Now it will remove the duplicated div id to prevent possible problem.

@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 Aug 18, 2025
@lunny lunny added type/bug backport/v1.24 This PR should be backported to Gitea 1.24 reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. labels Aug 18, 2025
@6543 6543 merged commit 4ea8f33 into go-gitea:main Aug 18, 2025
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 Aug 18, 2025
@GiteaBot
Copy link
Collaborator

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

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

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Aug 18, 2025
@kerwin612 kerwin612 deleted the feature/multi-line-selection-url branch August 19, 2025 07:05
zjjhot added a commit to zjjhot/gitea that referenced this pull request Aug 19, 2025
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
b84a143 
* giteaofficial/main:
  Refactor smal code snippeds in models/issues/pull.go  (go-gitea#35301)
  fix: remove duplicate IDs (go-gitea#35210)
  Add start time on perf trace because it seems some steps haven't been recorded. (go-gitea#35282)
  nix dev shell add zip (go-gitea#35300)
  [skip ci] Updated translations via Crowdin
  Fix LFS range size header response (go-gitea#35277)
  Skip "parentsigned" check when the repo is empty (go-gitea#35292)
  [skip ci] Updated translations via Crowdin
  Fix GitHub release assets URL validation (go-gitea#35287)
  nix flake use go1.25 (go-gitea#35288)
  go1.25.0 (go-gitea#35262)
  fix nix dev shell on darwin (go-gitea#35278)
  Fix token lifetime, closes go-gitea#35230 (go-gitea#35271)
  OneDev migration: fix broken migration caused by various REST API changes in OneDev 7.8.0 and later (go-gitea#35216)
  [skip ci] Updated translations via Crowdin
  Fix font-size in inline code comment preview (go-gitea#35209)
  Fix a bug where lfs gc never worked. (go-gitea#35198)
@lunny lunny mentioned this pull request Aug 21, 2025
Merged
@lunny lunny added the backport/done All backports for this PR have been created label Aug 21, 2025
lunny added a commit that referenced this pull request Aug 22, 2025
@lunny
fix: remove duplicate IDs (#35210) (#35325)
cc5ccf4 
backport #35210
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@silverwind silverwind silverwind left review comments

@wxiaoguang wxiaoguang wxiaoguang left review comments

@lunny lunny lunny approved these changes

@6543 6543 6543 approved these changes

+1 more reviewer

@appleboy appleboy appleboy approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/manual No power to the bots! Create your backport yourself! backport/v1.24 This PR should be backported to Gitea 1.24 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 type/bug
Projects
None yet
Milestone
1.25.0
Development

Successfully merging this pull request may close these issues.
7 participants
@kerwin612 @wxiaoguang @GiteaBot @appleboy @lunny @silverwind @6543