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

Show placeholder email in privacy popup #27770

Merged
merged 4 commits into from
Oct 25, 2023
Merged

Show placeholder email in privacy popup #27770

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
43e2f11
Show placeholder email in privacy popup
Oct 24, 2023
4b7be77
Merge branch 'main' into main
GiteaBot Oct 25, 2023
86b8cb7
Merge branch 'main' into main
GiteaBot Oct 25, 2023
5baefbd
Merge branch 'main' into main
GiteaBot Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ add_email_success = The new email address has been added.
email_preference_set_success = Email preference has been set successfully.
add_openid_success = The new OpenID address has been added.
keep_email_private = Hide Email Address
keep_email_private_popup = This will hide your email address from your profile, as well as when you make a pull request or edit a file using the web interface. Pushed commits will not be modified.
keep_email_private_popup = This will hide your email address from your profile, as well as when you make a pull request or edit a file using the web interface. Pushed commits will not be modified. Use %s in commits to associate them with your account.
openid_desc = OpenID lets you delegate authentication to an external provider.

manage_ssh_keys = Manage SSH Keys
Expand Down
2 changes: 1 addition & 1 deletion templates/user/settings/profile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

<div class="field">
<div class="ui checkbox">
<label data-tooltip-content="{{ctx.Locale.Tr "settings.keep_email_private_popup"}}"><strong>{{ctx.Locale.Tr "settings.keep_email_private"}}</strong></label>
<label data-tooltip-content="{{ctx.Locale.Tr "settings.keep_email_private_popup" .SignedUser.GetPlaceholderEmail}}"><strong>{{ctx.Locale.Tr "settings.keep_email_private"}}</strong></label>
Copy link
Contributor

Choose a reason for hiding this comment

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

"Use [email protected] in commits to associate them with your account."

Does it really work this way? I am not sure it really works, this is a fake email address, I can't figure out how it could "associate"

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Here is the mapping of the noreply address to the account:

gitea/models/user/user.go

Line 1132 in e544a27

if strings.HasSuffix(email, fmt.Sprintf("@%s", setting.Service.NoReplyAddress)) {

Although it's ugly that it does not use the GetPlaceholderEmail, it works. I tried it in my commit for act runner:
https://gitea.com/hakito/act_runner/commit/f21bc49bd2d81be3ca47ca5b6210a4b05f46e073

<input name="keep_email_private" type="checkbox" {{if .SignedUser.KeepEmailPrivate}}checked{{end}}>
</div>
</div>
Expand Down