summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMarius Balteanu <marius.balteanu@zitec.com>2023-11-17 07:30:03 +0000
committerMarius Balteanu <marius.balteanu@zitec.com>2023-11-17 07:30:03 +0000
commit12c5325cf790a984b4a2cb70fda9794a653e7955 (patch)
tree1039dab8862988a27a58b28da01d544b8ad0f4a2 /lib
parentc441f9757d5972d9d3ee5b4aa0d0fc079181abbe (diff)
downloadredmine-12c5325cf790a984b4a2cb70fda9794a653e7955.tar.gz
redmine-12c5325cf790a984b4a2cb70fda9794a653e7955.zip
Merged r22445, r22449 and r22450 from trunk to 5.1-stable (#39553).
git-svn-id: https://svn.redmine.org/redmine/branches/5.1-stable@22454 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib')
-rw-r--r--lib/redmine/acts/mentionable.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/lib/redmine/acts/mentionable.rb b/lib/redmine/acts/mentionable.rb
index c7b0c0655..24adf04b3 100644
--- a/lib/redmine/acts/mentionable.rb
+++ b/lib/redmine/acts/mentionable.rb
@@ -98,12 +98,10 @@ module Redmine
@([A-Za-z0-9_\-@\.]*?)
(?=
(?=[[:punct:]][^A-Za-z0-9_\/])|
- ,|
- \.+$|
\s|
- \]|
- <|
- $)
+ [[:punct:]]?
+ $
+ )
/ix
end
end