Add merge note type as cross reference

2019-08-12 15:07:15 +03:00 · 2019-08-12 15:07:15 +03:00 · 139df74253
parent fad6ac77da
commit 139df74253
2 changed files with 6 additions and 1 deletions
--- 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[
--- a/changelogs/unreleased/security-id-filter-timeline-activities-for-guests.yml
+++ 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