diff options
| author | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-12 15:07:15 +0300 |
|---|---|---|
| committer | Igor Drozdov <idrozdov@gitlab.com> | 2019-08-21 17:04:58 +0300 |
| commit | 3225137fed283d77e1aa4df98d9019c9c2ca192c (patch) | |
| tree | 0c5fa7421d74a9b34c85ab5d4249f5748f9e2843 | |
| parent | bef9aef425e5331af54c761d37338226f4d0f813 (diff) | |
| download | gitlab-ce-3225137fed283d77e1aa4df98d9019c9c2ca192c.tar.gz | |
Add merge note type as cross reference
| -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 55da37c9545..f7c9081d75b 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 |