diff options
author | Eugenia Grieff <egrieff@gitlab.com> | 2019-10-22 19:11:38 +0300 |
---|---|---|
committer | Eugenia Grieff <egrieff@gitlab.com> | 2019-10-24 13:20:06 +0300 |
commit | 3c60e336585ebfdba47707c399d0227d3b5fa404 (patch) | |
tree | 21b5cf81d23905dec08591d5f945e597ec153db5 /app | |
parent | 1425a56c75beecaa289ad59587d636f8f469509e (diff) |
Add milestone and label note types to cross refs
- Include new types in SystemNoteMetadata
- Add Label and Milestone reference_pattern to
Mentionable::ReferenceRegexes to be checked for cross references
Diffstat (limited to 'app')
-rw-r--r-- | app/models/concerns/mentionable/reference_regexes.rb | 4 | ||||
-rw-r--r-- | app/models/system_note_metadata.rb | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/app/models/concerns/mentionable/reference_regexes.rb b/app/models/concerns/mentionable/reference_regexes.rb index fec31cd262b..f44a674b3c9 100644 --- a/app/models/concerns/mentionable/reference_regexes.rb +++ b/app/models/concerns/mentionable/reference_regexes.rb @@ -13,7 +13,9 @@ module Mentionable def self.other_patterns [ Commit.reference_pattern, - MergeRequest.reference_pattern + MergeRequest.reference_pattern, + Label.reference_pattern, + Milestone.reference_pattern ] end diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb index 11cbeb60bba..5a44ee7211b 100644 --- a/app/models/system_note_metadata.rb +++ b/app/models/system_note_metadata.rb @@ -10,6 +10,7 @@ class SystemNoteMetadata < ApplicationRecord commit cross_reference close duplicate moved merge + label milestone ].freeze ICON_TYPES = %w[ |