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

Remove incorrect HTML self close tag #23748

Merged
merged 2 commits into from
Mar 27, 2023
Merged

Remove incorrect HTML self close tag #23748

merged 2 commits into from
Mar 27, 2023

Conversation

wxiaoguang
Copy link
Contributor

HTML is not XML.

@wxiaoguang wxiaoguang mentioned this pull request Mar 27, 2023
Merged
@wxiaoguang wxiaoguang changed the title Remove incorrect HTML short close tag Remove incorrect HTML self close tag Mar 27, 2023
@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 27, 2023
@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 Mar 27, 2023
@lunny lunny added reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. type/bug labels Mar 27, 2023
@lunny lunny added this to the 1.20.0 milestone Mar 27, 2023
@KN4CK3R
Copy link
Member

KN4CK3R commented Mar 27, 2023

🚀

@KN4CK3R KN4CK3R merged commit 31ab331 into go-gitea:main Mar 27, 2023
@KN4CK3R KN4CK3R removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 27, 2023
@wxiaoguang wxiaoguang deleted the fix-html-tag branch March 27, 2023 16:07
delvh
delvh reviewed Mar 27, 2023
View reviewed changes
Copy link
Member

@delvh delvh left a comment

Choose a reason for hiding this comment

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

Seems like your regex had three false positives.

templates/user/profile.tmpl
<div id="profile-avatar" class="content gt-df"/>
<div id="profile-avatar" class="content gt-df">
Copy link
Member

Choose a reason for hiding this comment

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

Did the logic change here?
Looks a bit like it to me…

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is right, I tested it.

Copy link
Member

Choose a reason for hiding this comment

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

The real closing </div> is in line 17.

Copy link
Member

Choose a reason for hiding this comment

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

And how has this worked previously?
Or has it always been wrong before?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

No, <div /> doesn't close.

<div />....</div> works like <div>....</div>

templates/repo/graph/svgcontainer.tmpl Show resolved Hide resolved
@wxiaoguang wxiaoguang mentioned this pull request Mar 27, 2023
Merged
zeripath pushed a commit that referenced this pull request Mar 27, 2023
@wxiaoguang
Fix SVG close tag, improve commit graph page UI alignment (#23751)
dfbefd1 
Follow #23748

Thanks to @delvh 

----

And, fix the UI alignment by the way (adding some `gt-mr-xx`)

Before:


![image](https://user-images.githubusercontent.com/2114189/228034794-7a6ac8d6-01fa-4dd2-97d4-0df0368f8ee0.png)

After:


![image](https://user-images.githubusercontent.com/2114189/228034938-64edeadf-7c99-4e74-b658-0ca62b72d596.png)
zeripath pushed a commit to zeripath/gitea that referenced this pull request Mar 27, 2023
@wxiaoguang @zeripath
Fix SVG close tag, improve commit graph page UI alignment (go-gitea#2…
3cc4611 
…3751)

Backport go-gitea#23751

Follow go-gitea#23748

Thanks to @delvh

----

And, fix the UI alignment by the way (adding some `gt-mr-xx`)

Before:

![image](https://user-images.githubusercontent.com/2114189/228034794-7a6ac8d6-01fa-4dd2-97d4-0df0368f8ee0.png)

After:

![image](https://user-images.githubusercontent.com/2114189/228034938-64edeadf-7c99-4e74-b658-0ca62b72d596.png)
techknowlogick pushed a commit that referenced this pull request Mar 27, 2023
@wxiaoguang
Fix profile page email display, respect settings (#23747)
6706ac2 
Always respect the `setting.UI.ShowUserEmail` and `KeepEmailPrivate`
setting.

* It doesn't make sense to show user's own E-mail to themself.
* Always hide the E-mail if KeepEmailPrivate=true, then the user could
know how their profile page looks like for others.
* Revert the `setting.UI.ShowUserEmail` change from #4981 . This setting
is used to control the E-mail display, not only for the user list page.

ps: the incorrect `<div .../>` tag on the profile page has been fixed by
#23748 together, so this PR becomes simpler.
@GiteaBot GiteaBot mentioned this pull request Mar 27, 2023
Merged
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 27, 2023
@wxiaoguang @GiteaBot
Fix profile page email display, respect settings (go-gitea#23747)
5e4fa3a 
Always respect the `setting.UI.ShowUserEmail` and `KeepEmailPrivate`
setting.

* It doesn't make sense to show user's own E-mail to themself.
* Always hide the E-mail if KeepEmailPrivate=true, then the user could
know how their profile page looks like for others.
* Revert the `setting.UI.ShowUserEmail` change from go-gitea#4981 . This setting
is used to control the E-mail display, not only for the user list page.

ps: the incorrect `<div .../>` tag on the profile page has been fixed by
go-gitea#23748 together, so this PR becomes simpler.
lunny pushed a commit that referenced this pull request Mar 27, 2023
@GiteaBot @wxiaoguang
Fix profile page email display, respect settings (#23747) (#23756)
1fed0e1 
Backport #23747 by @wxiaoguang

Always respect the `setting.UI.ShowUserEmail` and `KeepEmailPrivate`
setting.

* It doesn't make sense to show user's own E-mail to themself.
* Always hide the E-mail if KeepEmailPrivate=true, then the user could
know how their profile page looks like for others.
* Revert the `setting.UI.ShowUserEmail` change from #4981 . This setting
is used to control the E-mail display, not only for the user list page.

ps: the incorrect `<div .../>` tag on the profile page has been fixed by
#23748 together, so this PR becomes simpler.

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
zjjhot added a commit to zjjhot/gitea that referenced this pull request Mar 28, 2023
@zjjhot
Merge remote-tracking branch 'upstream/main'
708a34e 
* upstream/main:
  Fix issue due date edit toggle bug (go-gitea#23723)
  Fix profile page email display, respect settings (go-gitea#23747)
  Update Gitea version in docs (go-gitea#23755)
  Fix SVG close tag, improve commit graph page UI alignment (go-gitea#23751)
  Remove incorrect HTML self close tag (go-gitea#23748)
  Refactor repo commit list (go-gitea#23690)
  Fix tags view (go-gitea#23243)
  Add commit info in action page (go-gitea#23210)
  Use GitHub Actions compatible globbing for `branches`, `tag`, `path` filter (go-gitea#22804)
@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

@delvh delvh delvh left review comments

@KN4CK3R KN4CK3R KN4CK3R approved these changes

@silverwind silverwind silverwind approved these changes

Assignees
No one assigned
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Milestone
1.20.0
Development

Successfully merging this pull request may close these issues.
6 participants
@wxiaoguang @KN4CK3R @silverwind @delvh @lunny @GiteaBot