diff options
| author | Florian Zschocke <florian.zschocke@devolo.de> | 2016-12-12 22:59:12 +0100 |
|---|---|---|
| committer | Florian Zschocke <florian.zschocke@devolo.de> | 2016-12-12 22:59:12 +0100 |
| commit | 9a51d2bf8ed3663715fc735afb0444e179c334f7 (patch) | |
| tree | a266d07fe861e255d9dd8dd431b7edb37cb3e3e8 /src/main/java/com/gitblit/models | |
| parent | 6b0ac4155c4643de10a14166318f73e23616d36f (diff) | |
| parent | 7985115bd1301db867935b52a689ccfc32f13794 (diff) | |
| download | gitblit-9a51d2bf8ed3663715fc735afb0444e179c334f7.tar.gz gitblit-9a51d2bf8ed3663715fc735afb0444e179c334f7.zip | |
Merge branch 'fixMentionsInTickets-985'
Diffstat (limited to 'src/main/java/com/gitblit/models')
| -rw-r--r-- | src/main/java/com/gitblit/models/TicketModel.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/models/TicketModel.java b/src/main/java/com/gitblit/models/TicketModel.java index d5345891..65e29dc0 100644 --- a/src/main/java/com/gitblit/models/TicketModel.java +++ b/src/main/java/com/gitblit/models/TicketModel.java @@ -43,6 +43,8 @@ import java.util.regex.Pattern; import org.eclipse.jgit.util.RelativeDateFormatter; +import com.gitblit.Constants; + /** * The Gitblit Ticket model, its component classes, and enums. * @@ -773,10 +775,10 @@ public class TicketModel implements Serializable, Comparable<TicketModel> { } try { - Pattern mentions = Pattern.compile("\\s@([A-Za-z0-9-_]+)"); + Pattern mentions = Pattern.compile(Constants.REGEX_TICKET_MENTION); Matcher m = mentions.matcher(text); while (m.find()) { - String username = m.group(1); + String username = m.group("user"); plusList(Field.mentions, username); } } catch (Exception e) { |