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

Render email addresses as such if followed by punctuation #27987

Merged
merged 1 commit into from
Nov 11, 2023

Conversation

yardenshoham
Copy link
Member

Added the following characters to the regular expression for the email:

  • ,
  • ;
  • ?
  • !

Also added a test case.

Before

image

After

image

Added the following characters to the regular expression for the email:

- ,
- ;
- ?
- !

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label Nov 10, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Nov 10, 2023
@yardenshoham yardenshoham added backport/v1.20 This PR should be backported to Gitea 1.20 backport/v1.21 This PR should be backported to Gitea 1.21 topic/content-rendering Changes how certain filetypes are displayed labels Nov 10, 2023
@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 Nov 10, 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 Nov 10, 2023
@delvh delvh added the type/enhancement An improvement of existing functionality label Nov 10, 2023
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 10, 2023
@6543 6543 merged commit 1c0566f into go-gitea:main Nov 11, 2023
25 checks passed
@GiteaBot GiteaBot added this to the 1.22.0 milestone Nov 11, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label Nov 11, 2023
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Nov 11, 2023
…7987)

Added the following characters to the regular expression for the email:

- ,
- ;
- ?
- !

Also added a test case.

- Fixes go-gitea#27616 

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/c57eac26-f281-43ef-a51d-9c9a81b63efa)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/fc7d5c08-4350-4af0-a7f0-d1444d2d75af)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
GiteaBot pushed a commit to GiteaBot/gitea that referenced this pull request Nov 11, 2023
…7987)

Added the following characters to the regular expression for the email:

- ,
- ;
- ?
- !

Also added a test case.

- Fixes go-gitea#27616 

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/c57eac26-f281-43ef-a51d-9c9a81b63efa)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/fc7d5c08-4350-4af0-a7f0-d1444d2d75af)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
lunny pushed a commit that referenced this pull request Nov 11, 2023
…27992)

Backport #27987 by @yardenshoham

Added the following characters to the regular expression for the email:

- ,
- ;
- ?
- !

Also added a test case.

- Fixes #27616 

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/c57eac26-f281-43ef-a51d-9c9a81b63efa)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/fc7d5c08-4350-4af0-a7f0-d1444d2d75af)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: Yarden Shoham <git@yardenshoham.com>
lunny pushed a commit that referenced this pull request Nov 11, 2023
…27991)

Backport #27987 by @yardenshoham

Added the following characters to the regular expression for the email:

- ,
- ;
- ?
- !

Also added a test case.

- Fixes #27616 

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/c57eac26-f281-43ef-a51d-9c9a81b63efa)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/fc7d5c08-4350-4af0-a7f0-d1444d2d75af)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
Co-authored-by: Yarden Shoham <git@yardenshoham.com>
@yardenshoham yardenshoham deleted the issues/27616 branch November 11, 2023 08:12
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.20. @yardenshoham, please send one manually. 🍵

go run ./contrib/backport 27987
...  // fix git conflicts if any
go run ./contrib/backport --continue

@GiteaBot GiteaBot added the backport/manual No power to the bots! Create your backport yourself! label Nov 11, 2023
@GiteaBot
Copy link
Contributor

I was unable to create a backport for 1.21. @yardenshoham, please send one manually. 🍵

go run ./contrib/backport 27987
...  // fix git conflicts if any
go run ./contrib/backport --continue

@yardenshoham yardenshoham added backport/done All backports for this PR have been created and removed backport/manual No power to the bots! Create your backport yourself! labels Nov 11, 2023
zjjhot added a commit to zjjhot/gitea that referenced this pull request Nov 13, 2023
* giteaofficial/main:
  [skip ci] Updated licenses and gitignores
  Fix wrong xorm Delete usage (go-gitea#27995)
  Move some JS code from `fomantic.js` to standalone files (go-gitea#27994)
  Fix the wrong oauth2 name (go-gitea#27993)
  Render email addresses as such if followed by punctuation (go-gitea#27987)
  Show error toast when file size exceeds the limits (go-gitea#27985)
fuxiaohei pushed a commit to fuxiaohei/gitea that referenced this pull request Jan 17, 2024
…7987)

Added the following characters to the regular expression for the email:

- ,
- ;
- ?
- !

Also added a test case.

- Fixes go-gitea#27616 

# Before

![image](https://github.com/go-gitea/gitea/assets/20454870/c57eac26-f281-43ef-a51d-9c9a81b63efa)

# After

![image](https://github.com/go-gitea/gitea/assets/20454870/fc7d5c08-4350-4af0-a7f0-d1444d2d75af)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Feb 9, 2024
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 backport/v1.20 This PR should be backported to Gitea 1.20 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. topic/content-rendering Changes how certain filetypes are displayed type/enhancement An improvement of existing functionality
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Email addresses not rendered as such if followed by punctuation (except full stop)
5 participants