summaryrefslogtreecommitdiffstats
path: root/lib/redmine/acts/mentionable.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/redmine/acts/mentionable.rb')
-rw-r--r--lib/redmine/acts/mentionable.rb8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/redmine/acts/mentionable.rb b/lib/redmine/acts/mentionable.rb
index 24adf04b3..c7b0c0655 100644
--- a/lib/redmine/acts/mentionable.rb
+++ b/lib/redmine/acts/mentionable.rb
@@ -98,10 +98,12 @@ module Redmine
@([A-Za-z0-9_\-@\.]*?)
(?=
(?=[[:punct:]][^A-Za-z0-9_\/])|
+ ,|
+ \.+$|
\s|
- [[:punct:]]?
- $
- )
+ \]|
+ <|
+ $)
/ix
end
end