Add merge note type as cross reference

139df742 · Igor Drozdov · fad6ac77 · 139df742 · 139df742
Commit 139df742 authored Aug 12, 2019 by Igor Drozdov
Showing with 6 additions and 1 deletion

app/models/system_note_metadata.rb app/models/system_note_metadata.rb +1 -1

changelogs/unreleased/security-id-filter-timeline-activities-for-guests.yml ...sed/security-id-filter-timeline-activities-for-guests.yml +5 -0

No files found.
--- 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
+---
+title: Show cross-referenced MR-id in issues' activities only to authorized users
+merge_request:
+author:
+type: security