diff options
| author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-26 07:42:45 +0000 |
|---|---|---|
| committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-08-26 07:42:45 +0000 |
| commit | 9629d67d70cb229f0d17b080338b60de876ef9f2 (patch) | |
| tree | f25a5c088a4f0a86db6c04de077c330ef18e21dc | |
| parent | 51f5a8715800be8058b30e9ba4e203c408d7bc08 (diff) | |
| parent | 85aafc98bf94dc858dc3f1fd3e5a38289f99df62 (diff) | |
| download | gitlab-ce-9629d67d70cb229f0d17b080338b60de876ef9f2.tar.gz | |
Merge branch 'security-id-filter-timeline-activities-for-guests-12-1' into '12-1-stable'
Add merge note type as cross reference
See merge request gitlab/gitlabhq!3327
| -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 |