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.

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

Fix profile page email display, respect settings (#23747) #23756

Merged
merged 1 commit into from
Mar 27, 2023

Conversation

GiteaBot
Copy link
Contributor

Backport #23747 by @wxiaoguang

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

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

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.
@GiteaBot GiteaBot added this to the 1.19.1 milestone 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 merged commit 1fed0e1 into go-gitea:release/v1.19 Mar 27, 2023
@go-gitea go-gitea locked and limited conversation to collaborators May 3, 2023
@techknowlogick techknowlogick deleted the backport-23747-v1.19 branch September 9, 2023 05:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants