meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-03-17 14:38:13 +00:00
Code Issues Releases Wiki Activity

Merged r20936 from trunk to 4.2-stable (#34894).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@20942 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Go MAEDA 2021-04-14 00:23:15 +00:00
parent 5a91e65088
commit 361da73fa1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -1283,7 +1283,7 @@ module ApplicationHelper
)| )|
( (
(?<sep4>@) (?<sep4>@)
(?<identifier3>[A-Za-z0-9_\-@\.]*) (?<identifier3>[A-Za-z0-9_\-@\.]*?)
) )
) )
(?= (?=

1
test/helpers/application_helper_test.rb
View File

@ -521,6 +521,7 @@ class ApplicationHelperTest < Redmine::HelperTest
'user:JSMITH' => link_to_user(User.find_by_id(2)), 'user:JSMITH' => link_to_user(User.find_by_id(2)),
'user#2' => link_to_user(User.find_by_id(2)), 'user#2' => link_to_user(User.find_by_id(2)),
'@jsmith' => link_to_user(User.find_by_id(2)), '@jsmith' => link_to_user(User.find_by_id(2)),
'@jsmith.' => "#{link_to_user(User.find_by_id(2))}.",
'@JSMITH' => link_to_user(User.find_by_id(2)), '@JSMITH' => link_to_user(User.find_by_id(2)),
'@abcd@example.com' => link_to_user(User.find_by_id(u_email_id)), '@abcd@example.com' => link_to_user(User.find_by_id(u_email_id)),
'user:abcd@example.com' => link_to_user(User.find_by_id(u_email_id)), 'user:abcd@example.com' => link_to_user(User.find_by_id(u_email_id)),