diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-29 18:58:21 +0300 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-10-29 18:58:21 +0300 |
| commit | c7ee6535d491c4595b4e1e2736032d7d679ddb0d (patch) | |
| tree | b5b61914a891a46d96521a0abc6698acbab5b4c4 /app | |
| parent | 077f2c6c432342ce4d011583e86d671b2b326a56 (diff) | |
| parent | 4d8ed01bdc9b9f0ce687fbc6245a119e480e438d (diff) | |
Merge branch 'security-2920-fix-notes-with-label-cross-reference' into 'master'
Project path reveals labels from Private project if the issue is moved to public project
See merge request gitlab/gitlabhq!3419
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[ |