diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 21:53:59 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 21:53:59 +0300 |
| commit | 1f7ecd93c7ec7cf89ac618d8b3daf1fa549753ae (patch) | |
| tree | 6b2be10e984fa72edbc32b9819558b4239d83a06 /app | |
| parent | fe60a1d7a98c4ad476bfabf41cf68363445862f0 (diff) | |
| parent | 2df106fb17daf4b5a7308b6801c50196780b688b (diff) | |
Merge branch 'security-2920-fix-notes-with-label-cross-reference-12-2' into '12-2-stable'
Project path reveals labels from Private project if the issue is moved to public project
See merge request gitlab/gitlabhq!3445
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 b8fb3f71925..fb10035b92e 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 a19755d286a..bf19fd15290 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[ |