diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 21:53:14 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-24 21:53:14 +0300 |
| commit | 853618e05f6fea4a3a48822601c60a89830269f4 (patch) | |
| tree | d547d782169323b90d82d4a8a6e1859f7c1d336b /app | |
| parent | a6adb3368418e9c70b164428e7c9c654aaa11047 (diff) | |
| parent | 3c60e336585ebfdba47707c399d0227d3b5fa404 (diff) | |
Merge branch 'security-2920-fix-notes-with-label-cross-reference-12-4' into '12-4-stable'
Project path reveals labels from Private project if the issue is moved to public project
See merge request gitlab/gitlabhq!3490
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[ |