Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-05-07 20:47:12 +02:00
Code Issues Packages Projects Releases Activity

Merged r22445, r22449 and r22450 from trunk to 5.0-stable (#39553).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/branches/5.0-stable@22455 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu
2023-11-17 07:30:18 +00:00
parent 068559e9de
commit 6629fd6f3c
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/redmine/acts/mentionable.rb
View File

@@ -98,12 +98,10 @@ module Redmine
@([A-Za-z0-9_\-@\.]*?)
(?=
(?=[[:punct:]][^A-Za-z0-9_\/])|
,|
\.+$|
\s|
\]|
<|
$)
[[:punct:]]?
$
)
/ix
end
end

7
test/unit/lib/redmine/acts/mentionable_test.rb
View File

@@ -29,9 +29,12 @@ class Redmine::Acts::MentionableTest < ActiveSupport::TestCase
:issues
def test_mentioned_users_with_user_mention
issue = Issue.generate!(project_id: 1, description: '@dlopper')
to_test = %w(@dlopper @dlopper! @dlopper? @dlopper. @dlopper,)
assert_equal [User.find(3)], issue.mentioned_users
to_test.each do |item|
issue = Issue.generate!(project_id: 1, description: item)
assert_equal [User.find(3)], issue.mentioned_users
end
end
def test_mentioned_users_with_user_mention_having_mail_as_login