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

Merged
merged 4 commits into from
Mar 27, 2023

Conversation

wxiaoguang
Copy link
Contributor

@wxiaoguang wxiaoguang commented Mar 27, 2023

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.

@GiteaBot GiteaBot added the lgtm/need 1 This PR needs approval from one additional maintainer to be merged. label Mar 27, 2023
@zeripath zeripath added type/bug outdated/backport/v1.19 This PR should be backported to Gitea 1.19 and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels Mar 27, 2023
@zeripath zeripath added this to the 1.20.0 milestone Mar 27, 2023
@GiteaBot GiteaBot added the lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. label Mar 27, 2023
@lunny lunny added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 27, 2023
@wxiaoguang wxiaoguang changed the title Fix profile page div tag and email display Fix profile page email display, respect setting.UI.ShowUserEmail Mar 27, 2023
@wxiaoguang wxiaoguang changed the title Fix profile page email display, respect setting.UI.ShowUserEmail Fix profile page email display, respect settings Mar 27, 2023
@codecov-commenter
Copy link

Codecov Report

Merging #23747 (5bf1c01) into main (f521e88) will decrease coverage by 0.13%.
The diff coverage is 37.70%.

📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more

@@            Coverage Diff             @@
##             main   #23747      +/-   ##
==========================================
- Coverage   47.14%   47.01%   -0.13%     
==========================================
  Files        1149     1155       +6     
  Lines      151446   152496    +1050     
==========================================
+ Hits        71397    71694     +297     
- Misses      71611    72335     +724     
- Partials     8438     8467      +29     
Impacted Files Coverage Δ
cmd/dump.go 0.66% <0.00%> (-0.01%) ⬇️
cmd/web.go 0.00% <0.00%> (ø)
models/actions/run.go 1.64% <0.00%> (-0.08%) ⬇️
models/actions/runner.go 1.44% <ø> (ø)
models/packages/package.go 45.45% <0.00%> (-1.13%) ⬇️
models/user/search.go 77.50% <0.00%> (-6.29%) ⬇️
modules/actions/workflows.go 0.00% <0.00%> (ø)
modules/context/context.go 64.54% <0.00%> (-3.53%) ⬇️
modules/doctor/storage.go 30.65% <0.00%> (-1.29%) ⬇️
modules/setting/git.go 45.45% <ø> (ø)
... and 38 more

... and 53 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

@techknowlogick techknowlogick enabled auto-merge (squash) March 27, 2023 21:02
@techknowlogick
Copy link
Member

ping lg-tm

@techknowlogick techknowlogick merged commit 6706ac2 into go-gitea:main Mar 27, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Mar 27, 2023
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 the backport/done All backports for this PR have been created label Mar 27, 2023
lunny pushed a commit that referenced this pull request Mar 27, 2023
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
* 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)
@wxiaoguang wxiaoguang deleted the fix-profile-page branch March 28, 2023 02:58
@lunny lunny removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Mar 28, 2023
@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.
Labels
backport/done All backports for this PR have been created lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. outdated/backport/v1.19 This PR should be backported to Gitea 1.19 type/bug
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants