Merge branch 'security-id-filter-timeline-activities-for-guests' into 'master'

Add merge note type as cross reference

See merge request gitlab/gitlabhq!3319

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[

changelogs/unreleased/security-id-filter-timeline-activities-for-guests.yml

+---
+title: Show cross-referenced MR-id in issues' activities only to authorized users
+merge_request:
+author:
+type: security