summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorIgor Drozdov <idrozdov@gitlab.com>2019-08-12 15:07:15 +0300
committerIgor Drozdov <idrozdov@gitlab.com>2019-08-13 08:48:17 +0300
commit139df74253214fbab6aa703ed8ce381d0871aa46 (patch)
tree3323e8f4015d107132392db6af85887077d7f828 /app
parentfad6ac77da8a39c5630e693fcbf427a95ee1e460 (diff)
downloadgitlab-ce-139df74253214fbab6aa703ed8ce381d0871aa46.tar.gz
Add merge note type as cross reference
Diffstat (limited to 'app')
-rw-r--r--app/models/system_note_metadata.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/system_note_metadata.rb b/app/models/system_note_metadata.rb
index 9a2640db9ca..a19755d286a 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[