diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:33:59 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-29 21:33:59 +0000 |
| commit | fac22c13a8eac189fd531f6ae7016f6adaf64bcf (patch) | |
| tree | 8c57373568afaa519f4ee9647888ae344369ecf3 | |
| parent | be128484b5f74b25ac9559bc47375d30a803f296 (diff) | |
| parent | 139df74253214fbab6aa703ed8ce381d0871aa46 (diff) | |
| download | gitlab-ce-fac22c13a8eac189fd531f6ae7016f6adaf64bcf.tar.gz | |
Merge branch 'security-id-filter-timeline-activities-for-guests' into 'master'
Add merge note type as cross reference
See merge request gitlab/gitlabhq!3319
| -rw-r--r-- | app/models/system_note_metadata.rb | 2 | ||||
| -rw-r--r-- | changelogs/unreleased/security-id-filter-timeline-activities-for-guests.yml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb index 9a2640db9ca..a19755d286a 100644 --- a/app/models/system_note_metadata.rb +++ b/app/models/system_note_metadata.rb @@ -9,7 +9,7 @@ class SystemNoteMetadata < ApplicationRecord TYPES_WITH_CROSS_REFERENCES = %w[ commit cross_reference close duplicate - moved + moved merge ].freeze ICON_TYPES = %w[ diff --git a/changelogs/unreleased/security-id-filter-timeline-activities-for-guests.yml b/changelogs/unreleased/security-id-filter-timeline-activities-for-guests.yml new file mode 100644 index 00000000000..0fa5f89e2c0 --- /dev/null +++ b/changelogs/unreleased/security-id-filter-timeline-activities-for-guests.yml @@ -0,0 +1,5 @@ +--- +title: Show cross-referenced MR-id in issues' activities only to authorized users +merge_request: +author: +type: security |