From: Go MAEDA Date: Wed, 14 Apr 2021 00:23:15 +0000 (+0000) Subject: Merged r20936 from trunk to 4.2-stable (#34894). X-Git-Tag: 4.2.1~11 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=361da73fa1675c4c5818c42ceee8858dfacdc86b;p=redmine.git Merged r20936 from trunk to 4.2-stable (#34894). git-svn-id: http://svn.redmine.org/redmine/branches/4.2-stable@20942 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 9a16eb761..b328c4c9a 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1283,7 +1283,7 @@ module ApplicationHelper )| ( (?@) - (?[A-Za-z0-9_\-@\.]*) + (?[A-Za-z0-9_\-@\.]*?) ) ) (?= diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 106820999..730023443 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -521,6 +521,7 @@ class ApplicationHelperTest < Redmine::HelperTest 'user:JSMITH' => 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)), '@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)),