From 4261c16574a9dbe6e4be81dbd8a8f311eb7f9769 Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 14 Apr 2021 00:25:16 +0000 Subject: Merged r20936 from trunk to 4.1-stable (#34894). git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@20943 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/helpers/application_helper.rb | 2 +- test/helpers/application_helper_test.rb | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b5eb707aa..8b5d48c85 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1190,7 +1190,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 3fc1f90ad..2514e0721 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -456,6 +456,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)), -- cgit v1.2.3