Index: test/helpers/application_helper_test.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
--- a/test/helpers/application_helper_test.rb	(revision 36a4ecb90df050e08a5a1c5fae27d943e6c8cf5c)
+++ b/test/helpers/application_helper_test.rb	(date 1615812440651)
@@ -2000,6 +2000,15 @@
     end
   end
 
+  def test_parse_redmine_links_should_correctly_handle_user_login_at_line_end
+    expected = "<p>#{link_to_user(User.find_by(:id => 2))}.</p>"
+    %w[<p>@jsmith.</p> <p>user:jsmith.</p> <p>user#2.</p>].each do |text|
+      s = +text
+      parse_redmine_links(s, nil, nil, nil, true, {})
+      assert_equal expected, s
+    end
+  end
+
   private
 
   def wiki_links_with_special_characters
Index: app/helpers/application_helper.rb
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
--- a/app/helpers/application_helper.rb	(revision 36a4ecb90df050e08a5a1c5fae27d943e6c8cf5c)
+++ b/app/helpers/application_helper.rb	(date 1615812094494)
@@ -1251,7 +1251,7 @@
               )|
               (
               (?<sep4>@)
-              (?<identifier3>[A-Za-z0-9_\-@\.]*)
+              (?<identifier3>[A-Za-z0-9_\-@\.]*?)
               )
             )
             (?=