From 2864b77f1f5d0debec16fd7e386d9104ac3425c8 Mon Sep 17 00:00:00 2001
From: Benedikt Braunger <bb@emlix.com>
Date: Mon, 9 May 2022 17:44:02 +0200
Subject: [PATCH] Added more regexps to parse more SCM messages

---
 app/helpers/application_helper.rb | 4 +++-
 app/models/changeset.rb           | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 1dfa26cb2..d9a89417f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1277,7 +1277,7 @@ module ApplicationHelper
   LINKS_RE =
     %r{
             <a( [^>]+?)?>(?<tag_content>.*?)</a>|
-            (?<leading>[\s\(,\-\[\>]|^)
+            (?<leading>[\s\(,\-\[\>\/]|^)
             (?<esc>!)?
             (?<project_prefix>(?<project_identifier>[a-z0-9\-_]+):)?
             (?<prefix>attachment|document|version|forum|news|message|project|commit|source|export|user)?
@@ -1307,6 +1307,8 @@ module ApplicationHelper
             )
             (?=
               (?=[[:punct:]][^A-Za-z0-9_/])|
+              \-|
+              _|
               ,|
               \s|
               \]|
diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 4e04e4965..d1524ecb4 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -135,7 +135,7 @@ class Changeset < ActiveRecord::Base
     referenced_issues = []
     regexp =
       %r{
-        ([\s\(\[,-]|^)((#{kw_regexp})[\s:]+)?
+        ([\s\(\[,-\/]|^)((#{kw_regexp})[\s:]+)?
         (\#\d+(\s+@#{TIMELOG_RE})?([\s,;&]+\#\d+(\s+@#{TIMELOG_RE})?)*)
         (?=[[:punct:]]|\s|<|$)
       }xi
-- 
2.36.1