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 URL calculation in clone input box #29470

Merged
merged 3 commits into from
Feb 28, 2024
Merged

Fix URL calculation in clone input box #29470

merged 3 commits into from
Feb 28, 2024

Conversation

silverwind
Copy link
Member

Ported the function as-is and added comments so we don't forget about this in the future.

Fixes: #29462

@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Feb 28, 2024
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Feb 28, 2024
@silverwind silverwind added backport/v1.21 This PR should be backported to Gitea 1.21 and removed modifies/frontend labels Feb 28, 2024
@silverwind silverwind mentioned this pull request Feb 28, 2024
Closed
@silverwind
Fix URL calculation in clone input box
ff37736 
Ported the function as-is and added comments so we don't forget about
this in the future.

Fixes: go-gitea#29462
@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 Feb 28, 2024
@jolheiser
Copy link
Member

I haven't looked at the frontend closely in a while, is there no way to reuse the same code instead of trying to keep them in sync?

@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 Feb 28, 2024
@delvh
Copy link
Member

delvh commented Feb 28, 2024

Well… there is one:
We can move the inline function to JS, with the drawback

// synchronously set clone button states and urls here to avoid flickering on page load

@silverwind
Copy link
Member Author

No easy way to share code between a inline scripts and scripts that build with webpack. Moving the inline script to webpack causes rendering flashes, only web components could avoid those while staying in webpack.

@silverwind
Copy link
Member Author

Maybe https://github.com/icelam/html-inline-script-webpack-plugin can do it in the future.

@jolheiser jolheiser enabled auto-merge (squash) February 28, 2024 14:37
@jolheiser jolheiser added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Feb 28, 2024
@jolheiser jolheiser merged commit 82405f8 into go-gitea:main Feb 28, 2024
26 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Feb 28, 2024
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Feb 28, 2024
@silverwind @GiteaBot
Fix URL calculation in clone input box (go-gitea#29470)
4c579ea 
Ported the function as-is and added comments so we don't forget about
this in the future.

Fixes: go-gitea#29462
@GiteaBot GiteaBot mentioned this pull request Feb 28, 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 Feb 28, 2024
jolheiser pushed a commit that referenced this pull request Feb 28, 2024
@GiteaBot @silverwind
Fix URL calculation in clone input box (#29470) (#29473)
222f938 
Backport #29470 by @silverwind

Ported the function as-is and added comments so we don't forget about
this in the future.

Fixes: #29462

Co-authored-by: silverwind <me@silverwind.io>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Feb 29, 2024
@zjjhot
Merge remote-tracking branch 'giteaofficial/main'
dd1ca6c 
* giteaofficial/main: (23 commits)
  Fix wrong test usage of `AppSubURL` (go-gitea#29459)
  Improve contrast on blame timestamp, fix double border (go-gitea#29482)
  Fix/Improve `processWindowErrorEvent` (go-gitea#29407)
  Apply compact padding to small buttons with svg icons (go-gitea#29471)
  Fix counter display number incorrectly displayed on the page (go-gitea#29448)
  Fix incorrect user location link on profile page (go-gitea#29474)
  Fix workflow trigger event bugs (go-gitea#29467)
  Fix URL calculation in clone input box (go-gitea#29470)
  Remove jQuery from the "find file" page (go-gitea#29456)
  Move generate from module to service (go-gitea#29465)
  The job should always run when `if` is `always()` (go-gitea#29464)
  Recolor dark theme to blue shade (go-gitea#29283)
  Let ctx.FormOptionalBool() return optional.Option[bool] (go-gitea#29461)
  Implement actions badge svgs (go-gitea#28102)
  Fix missed return (go-gitea#29450)
  Use tailwind instead of `gt-[wh]-` helper classes (go-gitea#29423)
  Lock issues and pulls faster (go-gitea#29436)
  Allow to change primary email before account activation (go-gitea#29412)
  Update docs about `DEFAULT_ACTIONS_URL` (go-gitea#29442)
  Only use supported sort order for "explore/users" page (go-gitea#29430)
  ...
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Mar 8, 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

@jolheiser jolheiser jolheiser approved these changes

@wxiaoguang wxiaoguang wxiaoguang approved these changes

Assignees
No one assigned
Labels
backport/done All backports for this PR have been created backport/v1.21 This PR should be backported to Gitea 1.21 lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. type/bug
Projects
None yet
Milestone
1.22.0
Development

Successfully merging this pull request may close these issues.

repo page still shows incorrect clone url under different domain names
5 participants
@silverwind @jolheiser @delvh @wxiaoguang @GiteaBot